From 421b6fecb05764ef578edac6fe971d8a796566b9 Mon Sep 17 00:00:00 2001
From: Jonathan Druart <jonathan.druart@biblibre.com>
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 47d4adf..403276a 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
@@ -189,7 +189,7 @@
                       <td><input type="text" class="filter" data-column_num="5" placeholder="Search callnumber" /></td>
                       <td><input type="text" class="filter" data-column_num="6" placeholder="Search expiration date" /></td>
                       [% FOR field IN additional_fields_for_subscription %]
-                        <td><input type="text" class="filter" data-column_num="[% loop.count + 5 %]" placeholder="Search [% field.name %]" /></td>
+                        <td><input type="text" class="filter" data-column_num="[% loop.count + 6 %]" placeholder="Search [% field.name %]" /></td>
                       [% END %]
                       [% IF ( routing && CAN_user_serials_routing ) %]<td></td>[% END %]
                       <td></td>
-- 
2.0.0.rc2