From e8a2929d08e73013fc8aab3a13ed0642fe55ad90 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 --- koha-tmpl/opac-tmpl/bootstrap/en/includes/opac-bottom.inc | 1 - 1 file changed, 1 deletion(-) 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 @@ -