From 0f0de211caa4c0b0bdefdb8f0466f0a628654038 Mon Sep 17 00:00:00 2001 From: Robert Soulliere Date: Mon, 16 May 2011 09:12:09 -0700 Subject: [PATCH] Another test for merging github and offocial documentation repo. --- README | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README b/README index 68bfd7d9ba..b51bfc49ce 100644 --- a/README +++ b/README @@ -1,4 +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 -edited from github. +edited from github #2 . -- 2.43.2