fix bad conflict resolution made merging LP#1825851
authorGalen Charlton <gmc@equinoxinitiative.org>
Fri, 9 Aug 2019 14:10:23 +0000 (10:10 -0400)
committerGalen Charlton <gmc@equinoxinitiative.org>
Fri, 9 Aug 2019 14:10:23 +0000 (10:10 -0400)
commit71a8adacf6a4711b0682e010ca275a9d1f2e85f8
tree008bf6795ebc4a0d280f219dba68b815abae133a
parent5e4304589abce95735bd6c9e277a93baad443c4d
fix bad conflict resolution made merging LP#1825851

Signed-off-by: Galen Charlton <gmc@equinoxinitiative.org>
Open-ILS/src/sql/Pg/950.data.seed-values.sql