https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=33310 Katrin Fischer <katrin.fischer@bsz-bw.de> changed: What |Removed |Added ---------------------------------------------------------------------------- Status|Signed Off |Patch doesn't apply --- Comment #3 from Katrin Fischer <katrin.fischer@bsz-bw.de> --- Patch doesn't apply, can you please rebase? Apply? [(y)es, (n)o, (i)nteractive] y Applying: Bug 33310: Use template wrapper for tabs: Suggestions Using index info to reconstruct a base tree... M koha-tmpl/intranet-tmpl/prog/en/modules/suggestion/suggestion.tt Falling back to patching base and 3-way merge... Auto-merging koha-tmpl/intranet-tmpl/prog/en/modules/suggestion/suggestion.tt CONFLICT (content): Merge conflict in koha-tmpl/intranet-tmpl/prog/en/modules/suggestion/suggestion.tt error: Failed to merge in the changes. Patch failed at 0001 Bug 33310: Use template wrapper for tabs: Suggestions -- You are receiving this mail because: You are watching all bug changes.