https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=30566
David Nind <[email protected]> changed: What |Removed |Added ---------------------------------------------------------------------------- Status|Needs Signoff |Patch doesn't apply CC| |[email protected] --- Comment #2 from David Nind <[email protected]> --- Patch no lomger applies 8-(.. git bz apply 30566 Bug 30566 - Incorporate link handling in OPAC's biblio-title include 133405 - Bug 30566: Incorporate link handling in OPAC's biblio-title include Apply? [(y)es, (n)o, (i)nteractive] y Applying: Bug 30566: Incorporate link handling in OPAC's biblio-title include Using index info to reconstruct a base tree... M koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-reserve.tt M koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-tags.tt M koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-user.tt Falling back to patching base and 3-way merge... Auto-merging koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-user.tt CONFLICT (content): Merge conflict in koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-user.tt Auto-merging koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-tags.tt Auto-merging koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-reserve.tt error: Failed to merge in the changes. Patch failed at 0001 Bug 30566: Incorporate link handling in OPAC's biblio-title include -- 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/
