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>
Mon, 31 Jul 2017 14:12:51 +0000 (10:12 -0400)
commit940c31ccfec4ef4c78694231f9de43329e366d33
treedda44499462bfa51259183ea9bab3c92f04eb559
parent9ca1560c1356cf021b61db1c522a0a7ffde336bf
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