http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=7235
Julian Maurice <julian.maur...@biblibre.com> changed:
What |Removed |Added
----------------------------------------------------------------------------
Status|Needs Signoff |Patch doesn't apply
CC| |julian.maur...@biblibre.com
--- Comment #12 from Julian Maurice <julian.maur...@biblibre.com> ---
The second patch doesn't apply anymore:
Applying: Bug 7235: Adding invoice number and vendor name to the moredetail
page
Bug 7235: Add order date and checks for permissions
Apply? [yn] y
Applying: Bug 7235: Add order date and checks for permissions
fatal: sha1 information is lacking or useless
(koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/moredetail.tt).
Repository lacks necessary blobs to fall back on 3-way merge.
Cannot fall back to three-way merge.
Patch failed at 0001 Bug 7235: Add order date and checks for permissions
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".
Patch left in
/tmp/Bug-7235-Add-order-date-and-checks-for-permissions-JZZp_S.patch
--
You are receiving this mail because:
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/
