From: Jason Etheridge <jason@esilibrary.com>
Date: Mon, 5 Aug 2013 19:00:14 +0000 (-0400)
Subject: resolve merge conflict
X-Git-Url: https://old-git.evergreen-ils.org/?a=commitdiff_plain;h=79fdd7e0eb006ebe44b5925804ea9c4b5e6ad8e5;p=working%2FEvergreen.git

resolve merge conflict
---

79fdd7e0eb006ebe44b5925804ea9c4b5e6ad8e5