http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=7368

Paul Poulain <[email protected]> changed:

           What    |Removed                     |Added
----------------------------------------------------------------------------
             Status|Passed QA                   |Patch doesn't apply

--- Comment #13 from Paul Poulain <[email protected]> ---
For an unknown reason, I get a nasty

fatal: sha1 information is lacking or useless
(koha-tmpl/intranet-tmpl/prog/en/modules/acqui/z3950_search.tt).
Repository lacks necessary blobs to fall back on 3-way merge.
Cannot fall back to three-way merge.
Patch failed at 0001 7368 typo: MARC -> Card
When you have resolved this problem run "git am --resolved".


Can you resubmit ?

-- 
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/

Reply via email to