From dd0fd5311b2314ea3af6767e1f407cb3c70d76a0 Mon Sep 17 00:00:00 2001 From: Jonathan Druart Date: Thu, 20 Feb 2014 16:39:47 +0100 Subject: [PATCH] Bug 10858: fix bad merge conflict Content-Type: text/plain; charset=utf-8 Signed-off-by: Marcel de Rooy --- .../bootstrap/en/includes/opac-bottom.inc | 1 - 1 files changed, 0 insertions(+), 1 deletions(-) diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/includes/opac-bottom.inc b/koha-tmpl/opac-tmpl/bootstrap/en/includes/opac-bottom.inc index cada559..b48161b 100644 --- a/koha-tmpl/opac-tmpl/bootstrap/en/includes/opac-bottom.inc +++ b/koha-tmpl/opac-tmpl/bootstrap/en/includes/opac-bottom.inc @@ -79,7 +79,6 @@ -