Stamp 0999 upgrade; remove merge conflict markers
authorBill Erickson <berickxx@gmail.com>
Fri, 26 Aug 2016 21:00:20 +0000 (17:00 -0400)
committerDan Wells <dbw2@calvin.edu>
Fri, 26 Aug 2016 21:26:21 +0000 (17:26 -0400)
commite07ac6c32679a87ecf2dcc5c4c11a01347871313
tree5c4d9a737e43a6d2be5f54548bb2a3b169747c18
parent936fbc26d45f6685225988008241aac11de524e3
Stamp 0999 upgrade; remove merge conflict markers

Signed-off-by: Bill Erickson <berickxx@gmail.com>
Signed-off-by: Dan Wells <dbw2@calvin.edu>
Open-ILS/src/sql/Pg/002.schema.config.sql
Open-ILS/src/sql/Pg/950.data.seed-values.sql
Open-ILS/src/sql/Pg/upgrade/0999.schema.staging-user-setting.sql [new file with mode: 0644]
Open-ILS/src/sql/Pg/upgrade/YYYY.schema.staging-user-setting.sql [deleted file]