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

projects / evergreen / equinox.git / commit

author	Bill Erickson <berick@esilibrary.com>
	Wed, 3 Aug 2011 14:31:06 +0000 (10:31 -0400)
committer	Bill Erickson <berick@esilibrary.com>
	Wed, 3 Aug 2011 14:32:32 +0000 (10:32 -0400)
commit	14ae716ceff99375347ead1ea7f4d4aadaf2cd8a
tree	cdce22cb9085270fcbd6f6bb1d274edcb17324b4	tree
parent	15531609b8bd0b96423dbb78fd6d52b301cb18c5	commit \| diff
parent	720cf416cf0f30f4bf8e42ff5ec08ee356fe47c8	commit \| diff

Repaired merge conflicts resuling from ttopac-move-templates

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

39 files changed:

Open-ILS/src/perlmods/lib/OpenILS/WWW/EGCatLoader/Record.pm	diff1 \|	diff2 \|	blob \| history
Open-ILS/src/perlmods/lib/OpenILS/WWW/EGCatLoader/Search.pm	diff1 \|	diff2 \|	blob \| history
Open-ILS/src/templates/default/acq/common/li_table.tt2	\|	diff2 \|	blob \| history
Open-ILS/src/templates/default/cat/authority/list.tt2	\|	diff2 \|	blob \| history
Open-ILS/src/templates/default/conify/global/config/record_attr_definition.tt2	\|	diff2 \|	blob \| history
Open-ILS/src/templates/default/opac/advanced.tt2	\|	diff2 \|	blob \| history
Open-ILS/src/templates/default/opac/myopac/main.tt2	\|	diff2 \|	blob \| history
Open-ILS/src/templates/default/opac/myopac/main_pay.tt2	\|	diff2 \|	blob \| history
Open-ILS/src/templates/default/opac/myopac/main_payment_form.tt2	\|	diff2 \|	blob \| history
Open-ILS/src/templates/default/opac/myopac/main_payments.tt2	\|	diff2 \|	blob \| history
Open-ILS/src/templates/default/opac/myopac/receipt_email.tt2	\|	diff2 \|	blob \| history
Open-ILS/src/templates/default/opac/myopac/receipt_print.tt2	\|	diff2 \|	blob \| history
Open-ILS/src/templates/default/opac/myopac/update_email.tt2	\|	diff2 \|	blob \| history
Open-ILS/src/templates/default/opac/parts/advanced/global_row.tt2	\|	diff2 \|	blob \| history
Open-ILS/src/templates/default/opac/parts/advanced/search.tt2	\|	diff2 \|	blob \| history
Open-ILS/src/templates/default/opac/parts/chilifresh.tt2	\|	diff2 \|	blob \| history
Open-ILS/src/templates/default/opac/parts/header.tt2	\|	diff2 \|	blob \| history
Open-ILS/src/templates/default/opac/parts/js.tt2	\|	diff2 \|	blob \| history
Open-ILS/src/templates/default/opac/parts/login/form.tt2	\|	diff2 \|	blob \| history
Open-ILS/src/templates/default/opac/parts/misc_util.tt2	\|	diff2 \|	blob \| history
Open-ILS/src/templates/default/opac/parts/org_selector.tt2	\|	diff2 \|	blob \| history
Open-ILS/src/templates/default/opac/parts/place_hold.tt2	\|	diff2 \|	blob \| history
Open-ILS/src/templates/default/opac/parts/qtype_selector.tt2	\|	diff2 \|	blob \| history
Open-ILS/src/templates/default/opac/parts/record/awards.tt2	\|	diff2 \|	blob \| history
Open-ILS/src/templates/default/opac/parts/record/extras.tt2	\|	diff2 \|	blob \| history
Open-ILS/src/templates/default/opac/parts/record/summary.tt2	\|	diff2 \|	blob \| history
Open-ILS/src/templates/default/opac/parts/result/lowhits.tt2	\|	diff2 \|	blob \| history
Open-ILS/src/templates/default/opac/parts/result/lowhits_purchase.tt2	\|	diff2 \|	blob \| history
Open-ILS/src/templates/default/opac/parts/searchbar.tt2	\|	diff2 \|	blob \| history
Open-ILS/src/templates/default/opac/results.tt2	\|	diff2 \|	blob \| history
Open-ILS/src/templates/default/vandelay/inc/attrs.tt2	\|	diff2 \|	blob \| history
Open-ILS/src/templates/default/vandelay/inc/matches.tt2	\|	diff2 \|	blob \| history
Open-ILS/src/templates/default/vandelay/inc/profiles.tt2	\|	diff2 \|	blob \| history
Open-ILS/src/templates/default/vandelay/inc/queue.tt2	\|	diff2 \|	blob \| history
Open-ILS/src/templates/default/vandelay/inc/toolbar.tt2	\|	diff2 \|	blob \| history
Open-ILS/src/templates/default/vandelay/inc/upload.tt2	\|	diff2 \|	blob \| history
Open-ILS/src/templates/default/vandelay/vandelay.tt2	\|	diff2 \|	blob \| history
Open-ILS/src/templates_kcls/default/opac/parts/result/lowhits_purchase.tt2	\|	diff2 \|	blob \| history
Open-ILS/web/css/skin/default/opac/style.css	diff1 \|	diff2 \|	blob \| history

Evergreen working repo (Equinox)

RSS Atom

Open-ILS/src/perlmods/lib/OpenILS/WWW/EGCatLoader/Record.pm	diff1 \|	diff2 \|	blob \| history
Open-ILS/src/perlmods/lib/OpenILS/WWW/EGCatLoader/Search.pm	diff1 \|	diff2 \|	blob \| history
Open-ILS/src/templates/default/acq/common/li_table.tt2	\|	diff2 \|	blob \| history
Open-ILS/src/templates/default/cat/authority/list.tt2	\|	diff2 \|	blob \| history
Open-ILS/src/templates/default/conify/global/config/record_attr_definition.tt2	\|	diff2 \|	blob \| history
Open-ILS/src/templates/default/opac/advanced.tt2	\|	diff2 \|	blob \| history
Open-ILS/src/templates/default/opac/myopac/main.tt2	\|	diff2 \|	blob \| history
Open-ILS/src/templates/default/opac/myopac/main_pay.tt2	\|	diff2 \|	blob \| history
Open-ILS/src/templates/default/opac/myopac/main_payment_form.tt2	\|	diff2 \|	blob \| history
Open-ILS/src/templates/default/opac/myopac/main_payments.tt2	\|	diff2 \|	blob \| history
Open-ILS/src/templates/default/opac/myopac/receipt_email.tt2	\|	diff2 \|	blob \| history
Open-ILS/src/templates/default/opac/myopac/receipt_print.tt2	\|	diff2 \|	blob \| history
Open-ILS/src/templates/default/opac/myopac/update_email.tt2	\|	diff2 \|	blob \| history
Open-ILS/src/templates/default/opac/parts/advanced/global_row.tt2	\|	diff2 \|	blob \| history
Open-ILS/src/templates/default/opac/parts/advanced/search.tt2	\|	diff2 \|	blob \| history
Open-ILS/src/templates/default/opac/parts/chilifresh.tt2	\|	diff2 \|	blob \| history
Open-ILS/src/templates/default/opac/parts/header.tt2	\|	diff2 \|	blob \| history
Open-ILS/src/templates/default/opac/parts/js.tt2	\|	diff2 \|	blob \| history
Open-ILS/src/templates/default/opac/parts/login/form.tt2	\|	diff2 \|	blob \| history
Open-ILS/src/templates/default/opac/parts/misc_util.tt2	\|	diff2 \|	blob \| history
Open-ILS/src/templates/default/opac/parts/org_selector.tt2	\|	diff2 \|	blob \| history
Open-ILS/src/templates/default/opac/parts/place_hold.tt2	\|	diff2 \|	blob \| history
Open-ILS/src/templates/default/opac/parts/qtype_selector.tt2	\|	diff2 \|	blob \| history
Open-ILS/src/templates/default/opac/parts/record/awards.tt2	\|	diff2 \|	blob \| history
Open-ILS/src/templates/default/opac/parts/record/extras.tt2	\|	diff2 \|	blob \| history
Open-ILS/src/templates/default/opac/parts/record/summary.tt2	\|	diff2 \|	blob \| history
Open-ILS/src/templates/default/opac/parts/result/lowhits.tt2	\|	diff2 \|	blob \| history
Open-ILS/src/templates/default/opac/parts/result/lowhits_purchase.tt2	\|	diff2 \|	blob \| history
Open-ILS/src/templates/default/opac/parts/searchbar.tt2	\|	diff2 \|	blob \| history
Open-ILS/src/templates/default/opac/results.tt2	\|	diff2 \|	blob \| history
Open-ILS/src/templates/default/vandelay/inc/attrs.tt2	\|	diff2 \|	blob \| history
Open-ILS/src/templates/default/vandelay/inc/matches.tt2	\|	diff2 \|	blob \| history
Open-ILS/src/templates/default/vandelay/inc/profiles.tt2	\|	diff2 \|	blob \| history
Open-ILS/src/templates/default/vandelay/inc/queue.tt2	\|	diff2 \|	blob \| history
Open-ILS/src/templates/default/vandelay/inc/toolbar.tt2	\|	diff2 \|	blob \| history
Open-ILS/src/templates/default/vandelay/inc/upload.tt2	\|	diff2 \|	blob \| history
Open-ILS/src/templates/default/vandelay/vandelay.tt2	\|	diff2 \|	blob \| history
Open-ILS/src/templates_kcls/default/opac/parts/result/lowhits_purchase.tt2	\|	diff2 \|	blob \| history
Open-ILS/web/css/skin/default/opac/style.css	diff1 \|	diff2 \|	blob \| history