old-git.evergreen-ils.org Git - evergreen/equinox.git/commit

projects / evergreen / equinox.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: 750e34b f424dd8)

author	Bill Erickson <berick@esilibrary.com>
	Wed, 1 Jun 2011 20:26:45 +0000 (16:26 -0400)
committer	Bill Erickson <berick@esilibrary.com>
	Wed, 1 Jun 2011 20:26:45 +0000 (16:26 -0400)
commit	32b009c6a10dffa8b70f004cced69ddece93c08f
tree	80dafc44683bc16637c886048c3ec4df38c567dc	tree
parent	750e34b9f5db63e5e608234ae651591ba8d1aa1a	commit \| diff
parent	f424dd871e963b713b398fe38364c311d3c5f3a6	commit \| diff

Repaired seed data merge conflicts

Signed-off-by: Bill Erickson <berick@esilibrary.com>

Open-ILS/src/sql/Pg/950.data.seed-values.sql	diff1 \|	diff2 \|	blob \| history
Open-ILS/web/js/ui/default/actor/user/register.js	diff1 \|	diff2 \|	blob \| history

Evergreen working repo (Equinox)