@@ -, +, @@ --- installer/data/mysql/kohastructure.sql | 8 -------- 1 file changed, 8 deletions(-) --- a/installer/data/mysql/kohastructure.sql +++ a/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; --