projects
/
koha.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
7a945db
)
Removing merge commit
author
Chris Cormack
<chrisc@catalyst.net.nz>
Sat, 13 Nov 2010 16:40:55 +0000
(
05:40
+1300)
committer
Chris Cormack
<chrisc@catalyst.net.nz>
Sat, 13 Nov 2010 16:40:55 +0000
(
05:40
+1300)
installer/data/mysql/updatedatabase.pl
patch
|
blob
|
history
diff --git
a/installer/data/mysql/updatedatabase.pl
b/installer/data/mysql/updatedatabase.pl
index
62e4cd0
..
bf7acb6
100755
(executable)
--- 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";