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>
Fri, 3 Nov 2017 20:04:26 +0000 (16:04 -0400)
commitd09fafc4437d12a322b071894e15de9d1caa92d1
tree7b1171ac939eb8993770c8deec22d6fe54b52b8f
parent92a75849bc3a375f7d968a0667b63697a4becc54
fix error made when rebasing

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

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