test
authorRobert Soulliere <robert.soulliere@mohawkcollege.ca>
Tue, 17 May 2011 19:13:19 +0000 (12:13 -0700)
committerRobert Soulliere <robert.soulliere@mohawkcollege.ca>
Tue, 17 May 2011 19:13:19 +0000 (12:13 -0700)
README

diff --git a/README b/README
index 0014c0c..44d01f6 100644 (file)
--- a/README
+++ b/README
@@ -1,13 +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
 
 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
 
-<<<<<<< HEAD
-edited from github #2 .
-=======
-<<<<<<< HEAD
-test edit.
-edited from clone of official.
-=======
-edited from github.
->>>>>>> 6a6e1fef279d3d13450020fca14edbccef4fd7af
->>>>>>> 01f1cae45e26b13819546131fd5a57181e656bbb
+Edited from github_online branch.