fix root.xml

diff --git a/root.xml b/root.xml
index aa7fd99..74a3917 100755 (executable)
--- a/root.xml
+++ b/root.xml
@@ -3,7 +3,6 @@
       xmlns:xi="http://www.w3.org/2001/XInclude" version="5.0" xml:lang="EN"
       xmlns:xlink="http://www.w3.org/2001/xlink">
       <info>
-<<<<<<< rel_2_0
             <title>Evergreen 2.0 Documentation</title>
                <subtitle>Draft Version</subtitle>
 =======