From: rsoulliere <robert.soulliere@mohawkcollege.ca>
Date: Mon, 5 Dec 2011 20:26:25 +0000 (-0500)
Subject: fix root.xml
X-Git-Url: https://old-git.evergreen-ils.org/?a=commitdiff_plain;h=84b5a3ddf2996026cf3d600fe9245dfb537c25d7;p=Evergreen-DocBook.git

fix root.xml
---

diff --git a/root.xml b/root.xml
index aa7fd99..74a3917 100755
--- 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>
 =======