https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=19954
Katrin Fischer <[email protected]> changed: What |Removed |Added ---------------------------------------------------------------------------- QA Contact|[email protected] | Status|Signed Off |Patch doesn't apply --- Comment #6 from Katrin Fischer <[email protected]> --- Please rebase! Apply? [(y)es, (n)o, (i)nteractive] y Applying: Bug 19954: Update popup window templates to use Bootstrap grid: Patrons Using index info to reconstruct a base tree... M koha-tmpl/intranet-tmpl/prog/en/modules/members/update-child.tt Falling back to patching base and 3-way merge... Auto-merging koha-tmpl/intranet-tmpl/prog/en/modules/members/update-child.tt CONFLICT (content): Merge conflict in koha-tmpl/intranet-tmpl/prog/en/modules/members/update-child.tt error: Failed to merge in the changes. Patch failed at 0001 Bug 19954: Update popup window templates to use Bootstrap grid: Patrons The copy of the patch that failed is found in: .git/rebase-apply/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-19954-Update-popup-window-templates-to-use-Boo-iaYLLo.patch -- You are receiving this mail because: You are watching all bug changes. _______________________________________________ Koha-bugs mailing list [email protected] http://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/
