LP#1189989 Reworked conflicts from LP patch user/ldw/LP1189989_Suspend_Hold_At_Pacement
authorLiam Whalen <liam.whalen@bc.libraries.coop>
Wed, 13 May 2015 17:03:48 +0000 (10:03 -0700)
committerLiam Whalen <liam.whalen@bc.libraries.coop>
Wed, 13 May 2015 17:12:20 +0000 (10:12 -0700)
commit92a106afe8d056356aeed1322eea18d2901902fe
tree881e855f6a4fda1d6f5ab98cbe004abf06dcd1a5
parent9953f1a42b0c185a399c327a1462ebd06dcf4527
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