From 8e2d7e20916d5a0d3455a261880193636f52e288 Mon Sep 17 00:00:00 2001 From: Eivin Giske Skaaren Date: Wed, 9 Dec 2015 16:05:48 +0000 Subject: [PATCH] Remove merge conflict markers http://bugs.koha-community.org/show_bug.cgi?id=1277 http://bugs.koha-community.org/show_bug.cgi?id=12772 --- installer/data/mysql/kohastructure.sql | 8 -------- 1 file changed, 8 deletions(-) diff --git a/installer/data/mysql/kohastructure.sql b/installer/data/mysql/kohastructure.sql index 8c300e8..e4356b6 100644 --- a/installer/data/mysql/kohastructure.sql +++ b/installer/data/mysql/kohastructure.sql @@ -2576,15 +2576,7 @@ CREATE TABLE overduerules_transport_types( `message_transport_type` VARCHAR(20) NOT NULL DEFAULT 'email', `overduerules_id` INT(11) NOT NULL, PRIMARY KEY (id), -<<<<<<< HEAD - CONSTRAINT overduerules_fk FOREIGN KEY (overduerules_id) REFERENCES overduerules (overduerules_id) ON DELETE CASCADE ON UPDATE CASCADE, -======= -<<<<<<< HEAD - CONSTRAINT overduerules_fk FOREIGN KEY (branchcode, categorycode) REFERENCES overduerules (branchcode, categorycode) ON DELETE CASCADE ON UPDATE CASCADE, -======= CONSTRAINT overduerules_transport_types_fk FOREIGN KEY (overduerules_id) REFERENCES overduerules (overduerules_id) ON DELETE CASCADE ON UPDATE CASCADE, ->>>>>>> 6be069d... Bug 12772 - Update Database (Based on Bug13624) ->>>>>>> Bug 12772 - Update Database (Based on Bug13624) CONSTRAINT mtt_fk FOREIGN KEY (message_transport_type) REFERENCES message_transport_types (message_transport_type) ON DELETE CASCADE ON UPDATE CASCADE ) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci; -- 1.7.10.4