https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=19522
Victor Grousset/tuxayo <victor.grous...@biblibre.com> changed:
What |Removed |Added
----------------------------------------------------------------------------
Status|Patch doesn't apply |Signed Off
--- Comment #55 from Victor Grousset/tuxayo <victor.grous...@biblibre.com> ---
(In reply to Jonathan Druart from comment #48)
> error: sha1 information is lacking or useless
> (koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-manage.tt).
I resolved the conflict in this file.
The strange thing is that there didn't seem to be a conflict.
A git diff between my previous local branch for this bug and a new one (used
for the conflict resolution) showed nothing on the involved file.
But the patches successfully apply now.
--
You are receiving this mail because:
You are watching all bug changes.
_______________________________________________
Koha-bugs mailing list
Koha-bugs@lists.koha-community.org
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/
