[Koha-patches] [PATCH] remove leftover merge conflict marker to breaks updatedatabase.pl

[Galen Charlton]

Signed-off-by: Galen Charlton <gmcharlt at gmail.com>
---
 installer/data/mysql/updatedatabase.pl |    1 -
 1 files changed, 0 insertions(+), 1 deletions(-)

diff --git a/installer/data/mysql/updatedatabase.pl b/installer/data/mysql/updatedatabase.pl
index 62e4cd0..bf7acb6 100755
--- 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";
-- 
1.7.0