https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=39372
Katrin Fischer <[email protected]> changed: What |Removed |Added ---------------------------------------------------------------------------- Status|Signed Off |Patch doesn't apply --- Comment #29 from Katrin Fischer <[email protected]> --- Hi David, patch no longer applies cleanly - can you please rebase? Apply? [(y)es, (n)o, (i)nteractive] y Applying: Bug 39372: Limit OPAC list creation Using index info to reconstruct a base tree... M koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/opac.pref M koha-tmpl/opac-tmpl/bootstrap/en/includes/masthead.inc M koha-tmpl/opac-tmpl/bootstrap/en/includes/title-actions-menu.inc M koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-addbybiblionumber.tt M koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-basket.tt M koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-shelves.tt Falling back to patching base and 3-way merge... Auto-merging koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-shelves.tt CONFLICT (content): Merge conflict in koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-shelves.tt Auto-merging koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-basket.tt Auto-merging koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-addbybiblionumber.tt CONFLICT (content): Merge conflict in koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-addbybiblionumber.tt Auto-merging koha-tmpl/opac-tmpl/bootstrap/en/includes/title-actions-menu.inc Auto-merging koha-tmpl/opac-tmpl/bootstrap/en/includes/masthead.inc CONFLICT (content): Merge conflict in koha-tmpl/opac-tmpl/bootstrap/en/includes/masthead.inc Auto-merging koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/opac.pref error: Failed to merge in the changes. Patch failed at 0001 Bug 39372: Limit OPAC list creation hint: Use 'git am --show-current-patch=diff' to see the failed patch When you have resolved this problem run "git bz apply --continue". If you would prefer to skip this patch, instead run "git bz apply --skip". To restore the original branch and stop patching run "git bz apply --abort". Patch left in /tmp/Bug-39372-Limit-OPAC-list-creation-3rw97b0z.patch -- 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/
