Bug 16735: (QA follow-up) Fix rebase error
authorTomas Cohen Arazi <tomascohen@theke.io>
Mon, 11 Dec 2017 16:29:33 +0000 (13:29 -0300)
committerJonathan Druart <jonathan.druart@bugs.koha-community.org>
Mon, 12 Feb 2018 18:41:30 +0000 (15:41 -0300)
commitdc475cceabba7fceb3e53a8021cd9799b46b7d4b
treef5a8ee0e2a590ea5eab5a38a11f2ff908a628e98
parentae870e767a3edbb786e4815220c57ca624e3d5e3
Bug 16735: (QA follow-up) Fix rebase error

Signed-off-by: Tomas Cohen Arazi <tomascohen@theke.io>
Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>
koha-tmpl/intranet-tmpl/prog/en/modules/admin/branches.tt