https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=32057
David Nind <da...@davidnind.com> changed: What |Removed |Added ---------------------------------------------------------------------------- CC| |da...@davidnind.com Status|Needs Signoff |Patch doesn't apply --- Comment #3 from David Nind <da...@davidnind.com> --- The patch no longer applies 8-(... Applying: Bug 32057: Add optional stack trace to action logs Using index info to reconstruct a base tree... M installer/data/mysql/kohastructure.sql M installer/data/mysql/mandatory/sysprefs.sql Falling back to patching base and 3-way merge... Auto-merging installer/data/mysql/mandatory/sysprefs.sql Auto-merging installer/data/mysql/kohastructure.sql CONFLICT (content): Merge conflict in installer/data/mysql/kohastructure.sql error: Failed to merge in the changes. Patch failed at 0001 Bug 32057: Add optional stack trace to action logs -- You are receiving this mail because: You are watching all bug changes. _______________________________________________ Koha-bugs mailing list Koha-bugs@lists.koha-community.org https://lists.koha-community.org/cgi-bin/mailman/listinfo/koha-bugs website : http://www.koha-community.org/ git : http://git.koha-community.org/ bugs : http://bugs.koha-community.org/