[Koha-bugs] [Bug 25630] More capitalization and terminology fixes for system preferences

[bugzilla-daemon at bugs.koha-community.org]

https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=25630

--- Comment #26 from Katrin Fischer <katrin.fischer at bsz-bw.de> ---
I could rebase my patches without issues, but I am struggling with David's
follow up:

Applying: Bug 25630: (follow-up) Fix capitalization and terminology for system
preferences
error: sha1 information is lacking or useless
(koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/circulation.pref).
error: could not build fake ancestor
Patch failed at 0001 Bug 25630: (follow-up) Fix capitalization and terminology
for system preferences
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-25630-follow-up-Fix-capitalization-and-termino-Mizn9l.patch

I'll put my rebased patches here - maybe someone can help with the last one?

-- 
You are receiving this mail because:
You are watching all bug changes.