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

fixing conflict in updatedatabase

Browse source 
Signed-off-by: Chris Cormack <crc@liblime.com>
Signed-off-by: Joshua Ferraro <jmf@liblime.com>
This commit is contained in:
Joshua Ferraro 2007-10-29 21:13:47 -05:00
parent f3fac7a562
commit 4421616991
1 changed files with 0 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
updater/updatedatabase
View file

@ -346,13 +346,8 @@ if (C4::Context->preference("Version") < TransformToNum($DBversion)) {
SetVersion ($DBversion);
}
<<<<<<< HEAD:updater/updatedatabase
$DBversion = "3.00.00.013";
=======
>>>>>>> Updating updatedatabase and kohaversion.pl for new reports tables:updater/updatedatabase
if (C4::Context->preference("Version") < TransformToNum($DBversion)) {
<<<<<<< HEAD:updater/updatedatabase
$dbh->do("CREATE TABLE `import_batches` (
`import_batch_id` int(11) NOT NULL auto_increment,
`template_id` int(11) default NULL,