removing conflicts with head
authormiker <miker@dcc99617-32d9-48b4-a31d-7c20da2025e4>
Sat, 19 Apr 2008 00:09:31 +0000 (00:09 +0000)
committermiker <miker@dcc99617-32d9-48b4-a31d-7c20da2025e4>
Sat, 19 Apr 2008 00:09:31 +0000 (00:09 +0000)
commit3f338c8375770c1de6e1f2d6a28c4b10516007ef
tree6a7092c9e4bfad9d01d6383472c5a420ae7d2df5
parentd9868f67abd19bf350f4c0e64341bd54d639b2b3
removing conflicts with head

git-svn-id: svn://svn.open-ils.org/ILS/branches/acq-experiment@9382 dcc99617-32d9-48b4-a31d-7c20da2025e4
Open-ILS/src/sql/Pg/002.schema.config.sql