fix error made when rebasing
authorGalen Charlton <gmc@esilibrary.com>
Fri, 5 Aug 2016 17:43:22 +0000 (13:43 -0400)
committerMike Rylander <mrylander@gmail.com>
Thu, 31 Aug 2017 17:23:16 +0000 (13:23 -0400)
commit78c7efd07bb4ce9c4cbaa1e395996e5b88cdfeae
treee2cffdc569ab05417f4359d7df97f1dde9ff1aa3
parent2f7127ac5dfd1f8273f7daa278bf30b482503b4d
fix error made when rebasing

Signed-off-by: Galen Charlton <gmc@esilibrary.com>
Conflicts:
Open-ILS/web/js/ui/default/staff/circ/services/circ.js
Open-ILS/web/js/ui/default/staff/circ/services/circ.js