https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=26368
David Nind <da...@davidnind.com> changed: What |Removed |Added ---------------------------------------------------------------------------- CC| |da...@davidnind.com Status|Needs Signoff |Patch doesn't apply --- Comment #5 from David Nind <da...@davidnind.com> --- Patch no longer applies 8-(.. git bz apply 26368 Bug 26368 - Add support for OCLC Encoding level values 120209 - Bug 26368: Add OCLC options to marc21_leader.tt Apply? [(y)es, (n)o, (i)nteractive] y Applying: Bug 26368: Add OCLC options to marc21_leader.tt Using index info to reconstruct a base tree... M installer/data/mysql/mandatory/sysprefs.sql M koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/cataloguing.pref M koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_leader.tt Falling back to patching base and 3-way merge... Auto-merging koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_leader.tt Auto-merging koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/cataloguing.pref Auto-merging installer/data/mysql/mandatory/sysprefs.sql CONFLICT (content): Merge conflict in installer/data/mysql/mandatory/sysprefs.sql error: Failed to merge in the changes. Patch failed at 0001 Bug 26368: Add OCLC options to marc21_leader.tt -- 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/