https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=14723 Stina Hallin <stina.hallin@ub.lu.se> changed: What |Removed |Added ---------------------------------------------------------------------------- Status|Needs Signoff |Patch doesn't apply --- Comment #44 from Stina Hallin <stina.hallin@ub.lu.se> --- The patch didn't apply: CONFLICT (content): Merge conflict in t/db_dependent/Letters.t Auto-merging koha-tmpl/intranet-tmpl/prog/en/modules/members/notices.tt CONFLICT (content): Merge conflict in koha-tmpl/intranet-tmpl/prog/en/modules/members/notices.tt Auto-merging installer/data/mysql/kohastructure.sql Auto-merging C4/Letters.pm error: Failed to merge in the changes. Patch failed at 0001 Bug 14723: Additional delivery notes to messages The copy of the patch that failed is found in: .git/rebase-apply/patch -- You are receiving this mail because: You are watching all bug changes.