Merge branch 'master' of git.evergreen-ils.org:Evergreen-DocBook

[Evergreen-DocBook.git] / README

diff --git a/README b/README
index 850b393..01533bb 100644 (file)
--- a/README
+++ b/README
@@ -1,3 +1,7 @@
+<<<<<<< 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 
\ No newline at end of file
+edited now 
+=======
+This is a test from RS.
+>>>>>>> d4b0a79b9d915d7aa5782b06835a593aa68e0d18