http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=7001
Liz Rea <wizzy...@gmail.com> changed:
What |Removed |Added
----------------------------------------------------------------------------
CC| |wizzy...@gmail.com
--- Comment #11 from Liz Rea <wizzy...@gmail.com> 2011-12-16 18:10:12 UTC ---
Applying: bug_7001: Issue and Reserve slips are notices.
/home/liz/kohaclone/.git/rebase-apply/patch:700: trailing whitespace.
/home/liz/kohaclone/.git/rebase-apply/patch:1034: trailing whitespace.
ITEM RESERVED:
/home/liz/kohaclone/.git/rebase-apply/patch:2073: trailing whitespace.
[% UNLESS independant_branch %]
/home/liz/kohaclone/.git/rebase-apply/patch:2086: trailing whitespace.
[% END %]
/home/liz/kohaclone/.git/rebase-apply/patch:2135: trailing whitespace.
[% END %]
error: short SHA1 2ba7584 is ambiguous.
fatal: sha1 information is lacking or useless (C4/Print.pm).
Repository lacks necessary blobs to fall back on 3-way merge.
Cannot fall back to three-way merge.
Patch failed at 0001 bug_7001: Issue and Reserve slips are notices.
I ran the following (patch was downloaded from bz with git bz):
git am -3 /tmp/patch-OMWdbx.patch
--
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.
_______________________________________________
Koha-bugs mailing list
Koha-bugs@lists.koha-community.org
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/
