[Koha-bugs] [Bug 9341] Problem with UNIMARC authors facets

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

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

Katrin Fischer <katrin.fischer at bsz-bw.de> changed:

           What    |Removed                     |Added
----------------------------------------------------------------------------
                 CC|                            |katrin.fischer at bsz-bw.de

--- Comment #13 from Katrin Fischer <katrin.fischer at bsz-bw.de> ---
Hi Vitor,
I am sorry, but I can't get the second patch to apply, with or without the
first patch:

Apply? [y]es/[n]o/[e]dit/[v]iew patch/[a]ccept all y
Applying: Bug 9341: Problem with UNIMARC authors facets
fatal: sha1 information is lacking or useless (C4/Koha.pm).
Repository lacks necessary blobs to fall back on 3-way merge.
Cannot fall back to three-way merge.
Patch failed at 0001 Bug 9341: Problem with UNIMARC authors facets
When you have resolved this problem run "git am --resolved".
If you would prefer to skip this patch, instead run "git am --skip".
To restore the original branch and stop patching run "git am --abort".

Can you please rebase and resubmit? If you can rebase without bigger problems
(updatedatabase etc. is ok) switch back to Signed off.

-- 
You are receiving this mail because:
You are watching all bug changes.