[Koha-bugs] [Bug 7368] General staff client typo omnibus

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

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

Paul Poulain <paul.poulain at biblibre.com> changed:

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

--- Comment #13 from Paul Poulain <paul.poulain at biblibre.com> ---
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.