LP#1189989 Reworked conflicts from LP patch
authorLiam Whalen <liam.whalen@bc.libraries.coop>
Wed, 13 May 2015 17:03:48 +0000 (10:03 -0700)
committerJosh Stompro <stomproj@larl.org>
Wed, 19 Aug 2015 01:44:04 +0000 (20:44 -0500)
commitb393191090719911978a8587ae189d460dde37bc
tree4f97a488290268c080aef841db88e66a3c209c2d
parent3793dde7e439c43e83bc374b7dae4351c5f1e5fc
LP#1189989 Reworked conflicts from LP patch

A patch is available for this bug on LP, but it has conflicts.  This
commit fixes those conflicts.

Signed-off-by: Liam Whalen <liam.whalen@bc.libraries.coop>
Open-ILS/src/perlmods/lib/OpenILS/WWW/EGCatLoader/Account.pm
Open-ILS/src/templates/opac/parts/place_hold.tt2