update

revoltek · revoltek · commit a8905ab8a8af · 2017-12-05T08:28:01.000+01:00
diff --git a/README.md b/README.md
@@ -29,7 +29,7 @@ LoSoTo has an internl flag system encoded in the weight column. Weights are not
 
 Documentation:
 Documentation extracted from the LOFAR cookbook is present in the doc directory
-A detailed explanation of all the parameters for each operation is in: __parsets/losoto.parset__
+A detailed explanation of all the parameters for each operation is in: __parsets/losoto2.parset__
 
 Required packages:
 * PyTables version:  >3.0.0
diff --git a/docs/index.html b/docs/index.html
@@ -1,6 +1,3 @@
-<<<<<<< HEAD
-test
-=======
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
   "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 
@@ -114,4 +111,3 @@ <h3>Navigation</h3>
     </div>
   </body>
 </html>
->>>>>>> 9ea02676b1ad460a38697b18877106a43870e1de
diff --git a/parsets/losoto1.parset b/parsets/losoto1.parset
@@ -1,4 +1,4 @@
-# Example of LoSoTo parset
+# Example of LoSoTo 1.0 parset [deprecated!]
 # Includes all possible options
 #
 # step variable override global variable

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-# Example of LoSoTo parset`
	`1`	`+# Example of LoSoTo 1.0 parset [deprecated!]`
`2`	`2`	`# Includes all possible options`
`3`	`3`	`#`
`4`	`4`	`# step variable override global variable`