projects / working / Evergreen.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: df57275) | patch
fix breakage from recent merges collab/phasefx/fixes_for_recent_merges
authorJason Etheridge <jason@esilibrary.com>
Tue, 10 Jan 2012 20:49:23 +0000 (15:49 -0500)
committerJason Etheridge <jason@esilibrary.com>
Tue, 10 Jan 2012 20:49:23 +0000 (15:49 -0500)
commitd62a9c32b6c066da015e3f41de6a703f62a29497
tree48347688c213efd7b870e93e93bdc012f7dc881ftree
parentdf57275f7715752aeb1c6877a55072710711bb1acommit | diff
fix breakage from recent merges

Also, a good argument for keeping all perm additions in the same INSERT in the
950 file, since git would have reported a merge conflict against master had I
done that instead of simply appending the upgrade script to the file.

Signed-off-by: Jason Etheridge <jason@esilibrary.com>
Open-ILS/src/sql/Pg/002.schema.config.sql diff | blob | history
Open-ILS/src/sql/Pg/950.data.seed-values.sql diff | blob | history
Open-ILS/src/sql/Pg/upgrade/0666.schema.sms_carriers.sql diff | blob | history
Evergreen ILS