From 4421616991abf97bbd73a55a554dabc39e9c9d83 Mon Sep 17 00:00:00 2001 From: Joshua Ferraro Date: Mon, 29 Oct 2007 21:13:47 -0500 Subject: [PATCH] fixing conflict in updatedatabase Signed-off-by: Chris Cormack Signed-off-by: Joshua Ferraro --- updater/updatedatabase | 5 ----- 1 file changed, 5 deletions(-) diff --git a/updater/updatedatabase b/updater/updatedatabase index e6c619d080..74d4553b66 100755 --- a/updater/updatedatabase +++ b/updater/updatedatabase @@ -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, -- 2.20.1