From 84b5a3ddf2996026cf3d600fe9245dfb537c25d7 Mon Sep 17 00:00:00 2001
From: rsoulliere <robert.soulliere@mohawkcollege.ca>
Date: Mon, 5 Dec 2011 15:26:25 -0500
Subject: [PATCH] fix root.xml

---
 root.xml | 1 -
 1 file changed, 1 deletion(-)

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>
 =======
-- 
2.11.0