Koha-community/Koha
13
7
Fork 0
Code Issues Releases Wiki Activity

Removing merge commit

Browse source
This commit is contained in:
Chris Cormack 2010-11-14 05:40:55 +13:00
parent 7a945dbc28
commit 9ec8a89e51
1 changed files with 0 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
installer/data/mysql/updatedatabase.pl
View file

@ -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";