From 53ae153a96dd2e665eaaa22c82c78539180887b7 Mon Sep 17 00:00:00 2001
From: "Andrew E. Torda" <torda@zbh.uni-hamburg.de>
Date: Sun, 8 May 2022 15:35:30 +0200
Subject: [PATCH] Docs

---
 docs/doc.go | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/docs/doc.go b/docs/doc.go
index 0c36804..f646233 100644
--- a/docs/doc.go
+++ b/docs/doc.go
@@ -47,9 +47,6 @@ and they have the meaning
 If a final_temp is not specified, set the final temp to be the same as the initial temperature and do a run at constant temperature.
 If final_temp is lower than initial temperature, we will do simulated annealing.
 
-<<<<<<< HEAD
-Adaptive step sizes have been removed. They might come back later, but they made the main loop hard to read and the aim is just to provide a model for teaching.
-=======
 foutname is where a csv file will be written with values for plotting.
 
 xpltname is where a png file will be written with a plot of coordinates.
@@ -76,6 +73,5 @@ which is
 
 So if you want to plot the function value as a function of step, you would plot column 1 on the x-axis and column 3 on the y-axis. To plot the coordinates in the example above, you would plot columns 4, 5 and 6 on the y-axis.
 
->>>>>>> devel
 */
 package ackley_doc
-- 
GitLab