Bug 19641: (follow-up) Update circulation.tt too
authorJonathan Druart <jonathan.druart@bugs.koha-community.org>
Thu, 15 Feb 2018 18:20:16 +0000 (15:20 -0300)
committerJonathan Druart <jonathan.druart@bugs.koha-community.org>
Thu, 15 Feb 2018 18:21:15 +0000 (15:21 -0300)
commitf0e29fc46fbc9c6dad7bdd360a067696c930d4cc
tree4c0e90819ee7e3561e22b7407ad8950ea2f12c0e
parent4c45a5011ba815d1b13746a5c9192dfc51091dc7
Bug 19641: (follow-up) Update circulation.tt too

Fix bad merge conflict with bug 18403

Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>
koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt