From 10705d595d11895c5094181bb559ddb8e78d0ee8 Mon Sep 17 00:00:00 2001 From: Jonathan Druart Date: Fri, 20 Jun 2014 14:47:32 +0200 Subject: [PATCH] Bug 10855: FIX bad merge conflicts This patch fixes a bad merge conflicts. --- .../intranet-tmpl/prog/en/modules/serials/serials-search.tt | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) 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 c195704..0a5b093 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 @@ -11,18 +11,14 @@ //