From 2e4735bc2ca5467fd7213216f4cd6ec95b02a06a Mon Sep 17 00:00:00 2001 From: Michael Davis Date: Mon, 11 Jun 2012 11:39:27 +0100 Subject: [PATCH] bug 8130: remove merge marker --- installer/data/mysql/updatedatabase.pl | 1 - 1 files changed, 0 insertions(+), 1 deletions(-) diff --git a/installer/data/mysql/updatedatabase.pl b/installer/data/mysql/updatedatabase.pl index f0c186c..b255bf3 100755 --- a/installer/data/mysql/updatedatabase.pl +++ b/installer/data/mysql/updatedatabase.pl @@ -5308,7 +5308,6 @@ if (C4::Context->preference("Version") < TransformToNum($DBversion)) { SetVersion ($DBversion); } -<<<<<<< HEAD $DBversion = "3.09.00.010"; if ( C4::Context->preference("Version") < TransformToNum($DBversion) ) { $dbh->do("INSERT INTO systempreferences (variable,value,explanation,options,type) VALUES('IssueLostItem', 'alert', 'alert|confirm|nothing', 'Defines what should be done when an attempt is made to issue an item that has been marked as lost.', 'Choice')"); -- 1.7.2.5