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

--- Comment #39 from Jonathan Druart <jonathan.dru...@gmail.com> ---
(In reply to Owen Leonard from comment #32)
> This doesn't apply for me (on top of Bug 38255):
> 
> Applying: Bug 26553: Replace KohaTable with kohaTable
> error: sha1 information is lacking or useless
> (koha-tmpl/intranet-tmpl/prog/en/modules/circ/returns.tt).
> error: could not build fake ancestor
> Patch failed at 0001 Bug 26553: Replace KohaTable with kohaTable

Everything good for me here but I had a tiny conflict on bug 38255.

I pushed a branch to my gitlab repo in case it does not apply again, see
bug_26553.

-- 
You are receiving this mail because:
You are watching all bug changes.
_______________________________________________
Koha-bugs mailing list
Koha-bugs@lists.koha-community.org
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/

Reply via email to