From e7bbd2bbc2849063c5e69be54cc05eb1ced1058d Mon Sep 17 00:00:00 2001 From: Joshua Ferraro Date: Thu, 8 Nov 2007 19:07:45 -0600 Subject: [PATCH] fixing failed merge in updatedatabase Signed-off-by: Joshua Ferraro --- updater/updatedatabase | 6 ------ 1 file changed, 6 deletions(-) diff --git a/updater/updatedatabase b/updater/updatedatabase index 8c54bb0551..34d03ce7e7 100755 --- 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 -- 2.20.1