From cb28167d27f909851e14f4c164c1a67ef933dd7d Mon Sep 17 00:00:00 2001
From: rsoulliere <robert.soulliere@mohawkcollege.ca>
Date: Mon, 5 Dec 2011 15:35:15 -0500
Subject: [PATCH] fix another root.xml issue.

---
 root.xml | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/root.xml b/root.xml
index 74a3917..205b890 100755
--- a/root.xml
+++ b/root.xml
@@ -5,9 +5,6 @@
       <info>
             <title>Evergreen 2.0 Documentation</title>
  		<subtitle>Draft Version</subtitle>
-=======
-            <title>Evergreen 2.1 Documentation</title>
->>>>>>> local
 		<corpauthor>Documentation Interest Group</corpauthor>
 	         <mediaobject>
 			<imageobject>
-- 
2.11.0