https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=28639
David Nind <[email protected]> changed: What |Removed |Added ---------------------------------------------------------------------------- CC| |[email protected] Status|Needs Signoff |Patch doesn't apply --- Comment #18 from David Nind <[email protected]> --- The patch no longer applies 8-(.. git bz apply 28639 Bug 28639 - Embed see-from headings (from authorities) into bibliographic records at OAI repository level 171973 - Bug 28639: Embed see-from headings (from authorities) into bibliographic records at OAI repository level 171974 - Bug 28639: (follow_up) changing syspref name on atomic update file 171975 - Bug 28639: (follow-up) Changes method to embed see-from headings Apply? [(y)es, (n)o, (i)nteractive] y Applying: Bug 28639: Embed see-from headings (from authorities) into bibliographic records at OAI repository level Using index info to reconstruct a base tree... M Koha/OAI/Server/Repository.pm M installer/data/mysql/mandatory/sysprefs.sql M koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/web_services.pref Falling back to patching base and 3-way merge... Auto-merging koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/web_services.pref CONFLICT (content): Merge conflict in koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/web_services.pref Auto-merging installer/data/mysql/mandatory/sysprefs.sql CONFLICT (content): Merge conflict in installer/data/mysql/mandatory/sysprefs.sql Auto-merging Koha/OAI/Server/Repository.pm error: Failed to merge in the changes. Patch failed at 0001 Bug 28639: Embed see-from headings (from authorities) into bibliographic records at OAI repository level -- You are receiving this mail because: You are watching all bug changes. _______________________________________________ Koha-bugs mailing list [email protected] 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/
