https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=32693
--- Comment #34 from Katrin Fischer <[email protected]> --- Apply? [(y)es, (n)o, (i)nteractive] y Applying: Bug 32693: Update tab_item html helper Applying: Bug 32693: Update tab_items Applying: Bug 32693: Update tab_panels Using index info to reconstruct a base tree... M koha-tmpl/intranet-tmpl/prog/en/modules/about.tt Falling back to patching base and 3-way merge... Auto-merging koha-tmpl/intranet-tmpl/prog/en/modules/about.tt CONFLICT (content): Merge conflict in koha-tmpl/intranet-tmpl/prog/en/modules/about.tt error: Failed to merge in the changes. Patch failed at 0001 Bug 32693: Update tab_panels 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-32693-Update-tabpanels-_ghrc9c6.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/
