https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=33895 Sam Lau <samalau@gmail.com> changed: What |Removed |Added ---------------------------------------------------------------------------- CC| |samalau@gmail.com Status|Needs Signoff |Patch doesn't apply --- Comment #7 from Sam Lau <samalau@gmail.com> --- Applying: Bug 33895: Use template wrapper for tabs: OPAC user summary Using index info to reconstruct a base tree... M koha-tmpl/opac-tmpl/bootstrap/en/includes/holds-table.inc 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 Auto-merging koha-tmpl/opac-tmpl/bootstrap/en/includes/holds-table.inc CONFLICT (content): Merge conflict in koha-tmpl/opac-tmpl/bootstrap/en/includes/holds-table.inc error: Failed to merge in the changes. Patch failed at 0001 Bug 33895: Use template wrapper for tabs: OPAC user summary 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-33895-Use-template-wrapper-for-tabs-OPAC-user--VW0_jB.patch -- You are receiving this mail because: You are watching all bug changes.