[Koha-bugs] [Bug 8000] Test mode for notices

[bugzilla-daemon at bugs.koha-community.org]

http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=8000

koha at akafred.com changed:

           What    |Removed                     |Added
----------------------------------------------------------------------------
             Status|Needs Signoff               |Patch doesn't apply
                 CC|                            |koha at akafred.com

--- Comment #36 from koha at akafred.com ---
Patch failed at 0001 Bug 8000 - Override emails of every message sent from Koha

Details:

$ git show-ref -s HEAD
66c9e7a183e8e56c29b34e57d6c3c0b3cee09699

$ git bz apply 11140
No patches on bug 11140

$ git bz apply 8000

Bug 8000 - Test mode for notices

25924 - Bug 8000 - Override emails of every message sent from Koha
25925 - Bug 8000 - Missing test to trigger code change
25926 - Bug 8000 - Add a sentto_address column to message_queue
25928 - Bug 8000 - Correct inability to know where message was sent
25939 - Bug 8000 [QA Followup] - Change mis-used qw to q
25951 - Bug 8000 - Validate allEmailsTo email address before using it
26446 - Bug 8000: Replace Data::Validate::Email with Email::Valid

Applying: Bug 8000 - Override emails of every message sent from Koha
Auto-merging virtualshelves/sendshelf.pl
Auto-merging opac/opac-sendshelf.pl
Auto-merging opac/opac-sendbasket.pl
Auto-merging misc/cronjobs/runreport.pl
Auto-merging
koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/admin.pref
Auto-merging installer/data/mysql/updatedatabase.pl
CONFLICT (content): Merge conflict in installer/data/mysql/updatedatabase.pl
Auto-merging installer/data/mysql/sysprefs.sql
Auto-merging basket/sendbasket.pl
Auto-merging C4/Letters.pm
CONFLICT (content): Merge conflict in C4/Letters.pm
Failed to merge in the changes.
Patch failed at 0001 Bug 8000 - Override emails of every message sent from Koha

-- 
You are receiving this mail because:
You are watching all bug changes.