Merge conflict resolution
authorMike Rylander <mrylander@gmail.com>
Thu, 9 Jun 2011 18:08:05 +0000 (14:08 -0400)
committerMike Rylander <mrylander@gmail.com>
Thu, 9 Jun 2011 18:08:05 +0000 (14:08 -0400)
commit649c95973f037ee47c68a21f263c2d9e427e273e
tree49c6493bebfdc4c83c4260004df9d05b625854ed
parent9c11a36987b3261aedb307389a224c145e4e27fd
parent000ddbbe2f16c4e7ae0242f0032bc3c4f0cbfe14
Merge conflict resolution

Signed-off-by: Mike Rylander <mrylander@gmail.com>
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