[Koha-bugs] [Bug 5572] refinements to function merge sub merge in C4::AuthoritiesMarc

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

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

M. de Rooy <m.de.rooy at rijksmuseum.nl> changed:

           What    |Removed                     |Added
----------------------------------------------------------------------------
       Patch Status|Needs Signoff               |Does not apply

--- Comment #18 from M. de Rooy <m.de.rooy at rijksmuseum.nl> 2011-11-30 14:43:14 UTC ---
Applying: Changes to sub merge in C4::AuthoritiesMarc to refine authorities
merging -- safer version
error: patch failed: C4/AuthoritiesMarc.pm:1315
error: C4/AuthoritiesMarc.pm: patch does not apply
fatal: sha1 information is lacking or useless (C4/AuthoritiesMarc.pm).
Repository lacks necessary blobs to fall back on 3-way merge.
Cannot fall back to three-way merge.

-- 
Configure bugmail: http://bugs.koha-community.org/bugzilla3/userprefs.cgi?tab=email
------- You are receiving this mail because: -------
You are the QA Contact for the bug.
You are watching all bug changes.