[Koha-bugs] [Bug 19287] Add ability to mark an item 'Lost' from 'Holds to pull' list
bugzilla-daemon at bugs.koha-community.org
bugzilla-daemon at bugs.koha-community.org
Tue Apr 10 07:41:29 CEST 2018
https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=19287
Katrin Fischer <katrin.fischer at bsz-bw.de> changed:
What |Removed |Added
----------------------------------------------------------------------------
Status|Signed Off |Patch doesn't apply
--- Comment #56 from Katrin Fischer <katrin.fischer at bsz-bw.de> ---
The third patch won't apply, can you please take a look?
Apply? [(y)es, (n)o, (i)nteractive] y
Applying: Bug 19287: Add ability to mark an item 'Lost' from 'Holds to pull'
list
Applying: Bug 19287: Fix conflict with bug 19304
Applying: Bug 19287: Fix conflict with bug 19974
error: sha1 information is lacking or useless
(koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/circulation.pref).
error: could not build fake ancestor
Patch failed at 0001 Bug 19287: Fix conflict with bug 19974
The copy of the patch that failed is found in: .git/rebase-apply/patch
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".
Patch left in /tmp/Bug-19287-Fix-conflict-with-bug-19974-Ayu3UB.patch
--
You are receiving this mail because:
You are watching all bug changes.
More information about the Koha-bugs
mailing list