From 9ec8a89e51c4896c419f53792d4cc76e09997c9f Mon Sep 17 00:00:00 2001 From: Chris Cormack Date: Sun, 14 Nov 2010 05:40:55 +1300 Subject: [PATCH] Removing merge commit --- installer/data/mysql/updatedatabase.pl | 1 - 1 file changed, 1 deletion(-) diff --git a/installer/data/mysql/updatedatabase.pl b/installer/data/mysql/updatedatabase.pl index 62e4cd0a17..bf7acb60c2 100755 --- a/installer/data/mysql/updatedatabase.pl +++ b/installer/data/mysql/updatedatabase.pl @@ -3735,7 +3735,6 @@ if (C4::Context->preference("Version") < TransformToNum($DBversion)) { SetVersion ($DBversion); } -<<<<<<< HEAD:installer/data/mysql/updatedatabase.pl $DBversion = '3.01.00.999'; if (C4::Context->preference("Version") < TransformToNum($DBversion)) { print "Upgrade to $DBversion done (3.2.0 release candidate)\n"; -- 2.20.1