repaired seed data merge conflict
authorBill Erickson <berick@esilibrary.com>
Thu, 9 Jun 2011 17:29:35 +0000 (13:29 -0400)
committerBill Erickson <berick@esilibrary.com>
Thu, 9 Jun 2011 17:29:35 +0000 (13:29 -0400)
commit945146dbbb036c642bbba2738d90ad84774cb50f
treee3677cf3dc42ab1ef68a59a0dbf118ce0434d188
parent3e40a65fa4f38e1c30c4d6d30e2cc7f3e554fef6
parent000ddbbe2f16c4e7ae0242f0032bc3c4f0cbfe14
repaired seed data merge conflict
Open-ILS/src/sql/Pg/002.schema.config.sql
Open-ILS/src/sql/Pg/950.data.seed-values.sql
Open-ILS/xul/staff_client/chrome/content/main/menu.js