From: Robert Soulliere <robert.soulliere@mohawkcollege.ca>
Date: Mon, 16 May 2011 16:09:00 +0000 (-0700)
Subject: Edited README via GitHub
X-Git-Url: https://old-git.evergreen-ils.org/?a=commitdiff_plain;h=6a6e1fef279d3d13450020fca14edbccef4fd7af;p=evergreen%2Fmasslnc.git

Edited README via GitHub
---

diff --git a/README b/README
index 4ed3b99c9f..68bfd7d9ba 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
 
-test edit.
+edited from github.