[Koha-bugs] [Bug 15486] Restrict number of holds placed by day

[bugzilla-daemon at bugs.koha-community.org]

https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=15486

Katrin Fischer <katrin.fischer at bsz-bw.de> changed:

           What    |Removed                     |Added
----------------------------------------------------------------------------
             Status|Needs Signoff               |Patch doesn't apply

--- Comment #45 from Katrin Fischer <katrin.fischer at bsz-bw.de> ---
Hi Tomas, can you please rebase?

Apply? [(y)es, (n)o, (i)nteractive] y
Applying: Bug 15486: DB structure change
Applying: Bug 15486: DBIC update
Applying: Bug 15486: Make circ rules UI handle holds_per_day
fatal: sha1 information is lacking or useless
(koha-tmpl/intranet-tmpl/prog/en/modules/admin/smart-rules.tt).
Repository lacks necessary blobs to fall back on 3-way merge.
Cannot fall back to three-way merge.
Patch failed at 0001 Bug 15486: Make circ rules UI handle holds_per_day
The copy of the patch that failed is found in:
   /home/vagrant/kohaclone/.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-15486-Make-circ-rules-UI-handle-holdsperday-_6c76R.patch

-- 
You are receiving this mail because:
You are watching all bug changes.