From c01689b10096b4757dc8f15e00f632f5c170ee1b Mon Sep 17 00:00:00 2001 From: Jonathan Druart Date: Mon, 23 Dec 2013 10:53:35 +0100 Subject: [PATCH] Bug 10855: FIX bad conflict merge --- koha-tmpl/intranet-tmpl/prog/en/modules/serials/serials-search.tt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/serials-search.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/serials-search.tt index ee2fc74..61c031e 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/serials-search.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/serials-search.tt @@ -183,7 +183,7 @@ [% FOR field IN additional_fields_for_subscription %] - + [% END %] [% IF ( routing && CAN_user_serials_routing ) %][% END %] -- 1.7.10.4