repaired seed data merge conflict
authorBill Erickson <berick@esilibrary.com>
Fri, 10 Jun 2011 12:50:05 +0000 (08:50 -0400)
committerBill Erickson <berick@esilibrary.com>
Fri, 10 Jun 2011 12:50:05 +0000 (08:50 -0400)
commit4f0e795e0baa4d86eed98a418f3894d1f52d49a8
treef0fb9ebf4d1f4e43c85944f03bfc8bd07309c992
parentd3494f9726401da2188b5c810e68001d022f12c3
parent000ddbbe2f16c4e7ae0242f0032bc3c4f0cbfe14
repaired seed data merge conflict

Signed-off-by: Bill Erickson <berick@esilibrary.com>
Open-ILS/src/sql/Pg/950.data.seed-values.sql
Open-ILS/xul/staff_client/server/cat/copy_browser.js
Open-ILS/xul/staff_client/server/locale/en-US/cat.properties