Bugzilla – Attachment 45544 Details for
Bug 12772
Add item type and on-hold status to overdue notice/status triggers tool
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
Remove merge conflict markers
Remove-merge-conflict-markers.patch (text/plain), 1.63 KB, created by
Eivin Giske Skaaren
on 2015-12-09 16:09:20 UTC
(
hide
)
Description:
Remove merge conflict markers
Filename:
MIME Type:
Creator:
Eivin Giske Skaaren
Created:
2015-12-09 16:09:20 UTC
Size:
1.63 KB
patch
obsolete
>From 8e2d7e20916d5a0d3455a261880193636f52e288 Mon Sep 17 00:00:00 2001 >From: Eivin Giske Skaaren <eskaaren@yahoo.no> >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
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
|
Splinter Review
Attachments on
bug 12772
:
41477
|
41478
|
41479
|
41480
|
41855
|
42126
|
45184
|
45185
|
45186
|
45187
|
45188
|
45189
|
45190
|
45191
|
45192
|
45193
|
45194
|
45195
|
45196
|
45197
|
45198
|
45199
|
45200
|
45201
|
45202
|
45203
|
45204
|
45544
|
45545
|
45546
|
45547
|
45548
|
45549
|
45550
|
45551
|
45552
|
56063
|
56077