fix error made when rebasing
authorGalen Charlton <gmc@esilibrary.com>
Fri, 5 Aug 2016 17:43:22 +0000 (13:43 -0400)
committerGalen Charlton <gmc@equinoxinitiative.org>
Mon, 27 Mar 2017 20:22:14 +0000 (16:22 -0400)
commit7ea24b59c9734451842d9b584612dcc3f523e21d
tree14ee1f8b0ae594097fd3caa25d40bc547cb81523
parent0d7adab2e3385c80a169420379afed1bfd762785
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