https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=30515 Philip Orr <philip.orr@lmscloud.de> changed: What |Removed |Added ---------------------------------------------------------------------------- CC| |philip.orr@lmscloud.de Status|Needs Signoff |Patch doesn't apply --- Comment #20 from Philip Orr <philip.orr@lmscloud.de> --- Seems it doesn't apply: Using index info to reconstruct a base tree... M C4/Members/Messaging.pm M installer/data/mysql/en/mandatory/sample_notices.yml Falling back to patching base and 3-way merge... Auto-merging installer/data/mysql/en/mandatory/sample_notices.yml CONFLICT (content): Merge conflict in installer/data/mysql/en/mandatory/sample_notices.yml Removing installer/data/mysql/atomicupdate/bug_30515-add_system_preferences.pl Auto-merging C4/Members/Messaging.pm error: Failed to merge in the changes. Patch failed at 0001 Bug 30515: Fix messaging options order and add database changes Happy to sign off if you rebase :) -- You are receiving this mail because: You are watching all bug changes.