LP 1820741: Cleanup Dan Pearl's Code collab/dyrcona/lp1820741-receipt-omnibus
authorJason Stephenson <jason@sigio.com>
Fri, 20 Dec 2019 16:08:31 +0000 (11:08 -0500)
committerJason Stephenson <jason@sigio.com>
Mon, 16 Mar 2020 16:46:54 +0000 (12:46 -0400)
commit186dbaf01c455018edaf13ded52b0ad920f30f72
tree9ece2f9136cd3699b2779e986ef201c20a956cf7
parent7c17ab7219f5527ebb34d49cdd06022506682dd4
LP 1820741: Cleanup Dan Pearl's Code

Mostly remove conflict markers and some whitespace cleanup.

Signed-off-by: Jason Stephenson <jason@sigio.com>
Open-ILS/src/templates/staff/share/print_templates/t_hold_shelf_slip.tt2
Open-ILS/web/js/ui/default/staff/admin/workstation/app.js
Open-ILS/web/js/ui/default/staff/circ/patron/checkout.js
Open-ILS/web/js/ui/default/staff/circ/patron/items_out.js
Open-ILS/web/js/ui/default/staff/circ/services/circ.js