fixing failed merge in updatedatabase

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

diff --git a/updater/updatedatabase b/updater/updatedatabase
index 8c54bb0..34d03ce 100755 (executable)
--- a/updater/updatedatabase
+++ b/updater/updatedatabase
@@ -562,12 +562,6 @@ if (C4::Context->preference("Version") < TransformToNum($DBversion)) {
 }
 
 
-
-
-
-
-=======
->>>>>>> BUMP to 021 : items.damaged added:updater/updatedatabase
 =item DropAllForeignKeys($table)
 
   Drop all foreign keys of the table $table