@@ -, +, @@
rebase errors
---
installer/data/mysql/updatedatabase.pl | 1 +
.../prog/en/modules/admin/external-targets.tt | 8 +-
koha-tmpl/opac-tmpl/bootstrap/css/opac.css | 2692 +-------------------
.../bootstrap/en/modules/opac-external-search.tt | 23 +-
koha-tmpl/opac-tmpl/bootstrap/less/opac.less | 4 +
koha-tmpl/opac-tmpl/ccsr/en/css/opac.css | 4 +-
koha-tmpl/opac-tmpl/prog/en/css/opac.css | 4 +-
.../prog/en/modules/opac-external-search.tt | 24 +-
8 files changed, 53 insertions(+), 2707 deletions(-)
--- a/installer/data/mysql/updatedatabase.pl
+++ a/installer/data/mysql/updatedatabase.pl
@@ -7957,6 +7957,7 @@ if (CheckVersion($DBversion)) {
SetVersion($DBversion);
}
+$DBversion = "3.15.00.017";
if(CheckVersion($DBversion)) {
$dbh->do(q{
UPDATE systempreferences
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/external-targets.tt
+++ a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/external-targets.tt
@@ -112,10 +112,10 @@