removing adobe KDE supplied pdf image means we no longer need extra licensing note.

[Evergreen-DocBook.git] / README

diff --git a/README b/README
index 01533bb..3aee172 100644 (file)
--- a/README
+++ b/README
@@ -1,7 +1,3 @@
-<<<<<<< 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
+One more test.