Cleaned up some back-port merge mixups
authorBill Erickson <berick@esilibrary.com>
Wed, 20 Jul 2011 18:50:03 +0000 (14:50 -0400)
committerBill Erickson <berick@esilibrary.com>
Wed, 20 Jul 2011 18:50:03 +0000 (14:50 -0400)
commite572ff9328b7fc398d74971f442ae577a5cda624
tree560b799f1783c03fd763ec497b94b724867ac0a6
parentac75d1b601ab5222670779c5158dc29e1922c484
Cleaned up some back-port merge mixups

Signed-off-by: Bill Erickson <berick@esilibrary.com>
Open-ILS/src/perlmods/lib/OpenILS/WWW/AddedContent/OpenLibrary.pm
Open-ILS/src/perlmods/lib/OpenILS/WWW/EGCatLoader.pm
Open-ILS/src/perlmods/lib/OpenILS/WWW/EGCatLoader/Account.pm
Open-ILS/web/templates/default/opac/parts/login/form.tt2
Open-ILS/web/templates/default/opac/parts/result/table.tt2