https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=22999
Katrin Fischer <[email protected]> changed: What |Removed |Added ---------------------------------------------------------------------------- CC| |[email protected] Status|Signed Off |Patch doesn't apply --- Comment #6 from Katrin Fischer <[email protected]> --- I am sorry, Owen, but this one no longer applies: Apply? [(y)es, (n)o, (i)nteractive] y Applying: Bug 22999: Switch two-column templates to Bootstrap grid: Circulation Applying: Bug 22999: (follow-up) Indentation updates error: sha1 information is lacking or useless (koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt). error: could not build fake ancestor Patch failed at 0001 Bug 22999: (follow-up) Indentation updates 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-22999-follow-up-Indentation-updates-hr86eW.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/
