REsolve conflict messages in fixSyntax.

tools/README.md

@@ -4,3 +4,5 @@ RWAP Software's Online SuperBASIC manual - for conversion purposes
 This directory is filled with tools and goodies that I used or wrote when
 converting the old HTML into something resembling ReStructuredText. Much of what you see here is only used when the RST files need fixing up or something like that anyway!
 
+Don't go looking for first class codeing here by the way, there isn't any!
+

tools/buildTools.sh

@@ -0,0 +1,17 @@
+# Compile the tools utilities. These don't come down from GitHub, so 
+# they will need recompiling each time a fresh install is done.
+#
+# You uneed to be in the tools directory to run this build script.
+#
+#
+# Norman Dunbar
+# 4th August 2016.
+
+for CPP in `ls *.cpp`
+do
+    EXE=${CPP%%.cpp}
+    g++ -o ${EXE} ${CPP}
+    echo ${CPP} has been compiled to ${EXE}
+done
+
+

tools/fixSyntax.cpp

@@ -186,29 +186,6 @@ void doLocation(const size_t pos)
 
     // And write out the blank line we just read.
     cout << a_line << endl;
-<<<<<<< HEAD
-=======
-}
-
-
-void doBoth(const size_t posSyntax, const size_t posLocation)
-{
-    // We have Syntax: and Location: on the same line.
-    // Split off the Location: part, keeping "Location:".
-    string locBuffer = a_line.substr(posLocation, string::npos);
-
-    // Keep just the Syntax: part.
-    a_line = a_line.substr(posSyntax + 7, posLocation - 8);
-
-    // Write out the syntax table cell and the syntax details.
-    cout << tableSeparator << endl;
-    cout << "| Syntax   | " << a_line;
-    cout << setw(80-13-a_line.size()) << "|" << endl;
-
-    // Then do the Location details.
-    a_line = locBuffer;
-    doLocation(0);   
->>>>>>> 7cd46473e310c9aaef3d85b890a6a06918ef189c
 }