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

Katrin Fischer <[email protected]> changed:

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

--- Comment #4 from Katrin Fischer <[email protected]> 2011-05-23 
20:50:43 UTC ---
Tried to apply 2nd patch: proposed patch for T::TT

Apply? [y]es/[n]o/[e]dit/[v]iew patch/[a]ccept all y
Applying: MT5189 let's the librarian choose the itemtype when ordering
fatal: sha1 information is lacking or useless (acqui/neworderempty.pl).
Repository lacks necessary blobs to fall back on 3-way merge.
Cannot fall back to three-way merge.
Patch failed at 0001 MT5189 let's the librarian choose the itemtype when
ordering
When you have resolved this problem run "git am --resolved".
If you would prefer to skip this patch, instead run "git am --skip".

-- 
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.
_______________________________________________
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