From 3f90096d8239fa46626bca0c599fc8abf4806e87 Mon Sep 17 00:00:00 2001
From: rsoulliere <robert.soulliere@mohawkcollege.ca>
Date: Mon, 16 May 2011 10:43:58 -0400
Subject: [PATCH] Test edit.

---
 README | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/README b/README
index 01533bb34c..4ed3b99c9f 100644
--- a/README
+++ b/README
@@ -1,7 +1,4 @@
 <<<<<<< HEAD
 This is the documentation for the Evergreen Open-ILS project. It is maintained by DIG volunteers. For the published documentation, visit: http://docs.evergreen-ils.org
 
-edited now 
-=======
-This is a test from RS.
->>>>>>> d4b0a79b9d915d7aa5782b06835a593aa68e0d18
+test edit.
-- 
2.11.0