[Koha-bugs] [Bug 11311] Browse selected authorities
bugzilla-daemon at bugs.koha-community.org
bugzilla-daemon at bugs.koha-community.org
Tue Mar 11 14:51:39 CET 2014
http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=11311
Sonia Lemaire <lemairesonia at gmail.com> changed:
What |Removed |Added
----------------------------------------------------------------------------
Status|Needs Signoff |Patch doesn't apply
CC| |lemairesonia at gmail.com
--- Comment #3 from Sonia Lemaire <lemairesonia at gmail.com> ---
Some problems occurred applying patches from bug 11311:
<h1>Something went wrong !</h1>Applying: Bug 11311: Browse selected authorities
fatal: sha1 information is lacking or useless
(koha-tmpl/opac-tmpl/prog/en/js/commons.js).
Repository lacks necessary blobs to fall back on 3-way merge.
Cannot fall back to three-way merge.
Patch failed at 0001 Bug 11311: Browse selected authorities
When you have resolved this problem run git bz apply --continue.
If you would prefer to skip this patch, instead run git bz apply --skip.
To restore the original branch and stop patching run git bz apply --abort.
Bug 11311 - Browse selected authorities
23185 - Bug 11311: Browse selected authorities
Apply? [(y)es, (n)o, (i)nteractive] Patch left in
/tmp/Bug-11311-Browse-selected-authorities-n3If5J.patch .
--
You are receiving this mail because:
You are watching all bug changes.
More information about the Koha-bugs
mailing list