-<<<<<<< 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
-<<<<<<< HEAD
-test edit.
-edited from clone of official.
-=======
-edited from github.
->>>>>>> 6a6e1fef279d3d13450020fca14edbccef4fd7af
+One more test.