https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=39677
Laura Escamilla <[email protected]> changed: What |Removed |Added ---------------------------------------------------------------------------- CC| |Laura.escamilla@bywatersolu | |tions.com Status|Signed Off |Patch doesn't apply --- Comment #8 from Laura Escamilla <[email protected]> --- Hi! Looks like we might need another rebase -- Applying: Bug 39677: Add the role presentation to the divider vertical tags Using index info to reconstruct a base tree... M koha-tmpl/opac-tmpl/bootstrap/en/includes/masthead.inc Falling back to patching base and 3-way merge... 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 error: Failed to merge in the changes. Patch failed at 0001 Bug 39677: Add the role presentation to the divider vertical tags 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-39677-Add-the-role-presentation-to-the-divider-q9yymcu4.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/
