fixing conflict in updatedatabase

Signed-off-by: Chris Cormack <crc@liblime.com>
Signed-off-by: Joshua Ferraro <jmf@liblime.com>

diff --git a/updater/updatedatabase b/updater/updatedatabase
index e6c619d..74d4553 100755 (executable)
--- 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,