From: Bill Erickson <berick@esilibrary.com>
Date: Wed, 1 Jun 2011 20:26:45 +0000 (-0400)
Subject: Repaired seed data merge conflicts
X-Git-Url: https://old-git.evergreen-ils.org/?a=commitdiff_plain;h=32b009c6a10dffa8b70f004cced69ddece93c08f;p=evergreen%2Fequinox.git

Repaired seed data merge conflicts

Signed-off-by: Bill Erickson <berick@esilibrary.com>
---

32b009c6a10dffa8b70f004cced69ddece93c08f