oops, went wrong way with merge conflict reconciliation
authorGalen Charlton <gmc@esilibrary.com>
Wed, 4 May 2016 19:13:34 +0000 (15:13 -0400)
committerGalen Charlton <gmc@esilibrary.com>
Wed, 4 May 2016 19:13:34 +0000 (15:13 -0400)
commitff8ab013167ec23c8314dc61419691e6fae4dc3e
tree3e9d3fd5128853477dc375aaf2b0451cfb45129a
parent8fc6640208762cd1c0fe2df7e137533f5e5cd403
oops, went wrong way with merge conflict reconciliation

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