From 07976c4389a7f4ff7e6fdb5bbbb3eafad4a63f90 Mon Sep 17 00:00:00 2001 From: Robert Soulliere Date: Tue, 17 May 2011 12:13:19 -0700 Subject: [PATCH 1/1] test --- README | 13 ++----------- 1 file changed, 2 insertions(+), 11 deletions(-) diff --git a/README b/README index 0014c0c532..44d01f6bb7 100644 --- 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 -<<<<<<< HEAD -edited from github #2 . -======= -<<<<<<< HEAD -test edit. -edited from clone of official. -======= -edited from github. ->>>>>>> 6a6e1fef279d3d13450020fca14edbccef4fd7af ->>>>>>> 01f1cae45e26b13819546131fd5a57181e656bbb +Edited from github_online branch. -- 2.43.2