From dd0fd5311b2314ea3af6767e1f407cb3c70d76a0 Mon Sep 17 00:00:00 2001
From: Jonathan Druart <jonathan.druart@biblibre.com>
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 <m.de.rooy@rijksmuseum.nl>
---
 .../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 @@
 <script type="text/javascript" src="[% interface %]/[% theme %]/lib/jquery/jquery-ui.js"></script>
 <script type="text/javascript" src="[% interface %]/[% theme %]/lib/bootstrap/js/bootstrap.min.js"></script>
 <script type="text/javascript" src="[% interface %]/[% theme %]/js/global.js"></script>
-<script type="text/javascript" src="[% interface %]/[% theme %]/lib/jquery/jquery.js"></script>
 <script type="text/javascript" src="[% interface %]/[% theme %]/lib/jquery/plugins/jquery.cookie.min.js"></script>
 <script type="text/javascript" src="[% interface %]/[% theme %]/js/commons.js"></script>
 <script type="text/javascript">
-- 
1.7.7.6