https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=30036
David Nind <[email protected]> changed: What |Removed |Added ---------------------------------------------------------------------------- Status|Needs Signoff |Patch doesn't apply CC| |[email protected] --- Comment #3 from David Nind <[email protected]> --- Patch no longer applies + whitespace errors 8-(.. git bz apply 30036 Bug 30036 - Add xslt for authority results normal view in OPAC 130232 - Bug 30036: Add xslt for authority results normal view in OPAC Apply? [(y)es, (n)o, (i)nteractive] y Applying: Bug 30036: Add xslt for authority results normal view in OPAC .git/rebase-apply/patch:107: trailing whitespace. warning: 1 line adds whitespace errors. 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/staff_interface.pref M koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-authoritiessearchresultlist.tt .git/rebase-apply/patch:107: trailing whitespace. warning: 1 line applied after fixing whitespace errors. Falling back to patching base and 3-way merge... Auto-merging koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-authoritiessearchresultlist.tt Auto-merging koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/staff_interface.pref CONFLICT (content): Merge conflict in koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/staff_interface.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 30036: Add xslt for authority results normal view in OPAC -- 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/
