https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=27432
--- Comment #13 from Fridolin Somers <[email protected]> --- (In reply to Katrin Fischer from comment #12) > I feel something is out of order here - patches don't apply in the current > sequence. > > Apply? [(y)es, (n)o, (i)nteractive] y > Applying: Bug 27432: (follow-up) Correct grammar of preference description > error: sha1 information is lacking or useless > (koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/logs.pref). > error: could not build fake ancestor > Patch failed at 0001 Bug 27432: (follow-up) Correct grammar of preference > description > 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-27432-follow-up-Correct-grammar-of-preference--qT_FEt.patch Ah indeed, patch : Bug 27432: (follow-up) Correct grammar of preference description Is from 17:45 and other patches are from 17:54. I think this patch must be moved after main patch : Bug 27432: Add report run to action logs -- 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/
