[Koha-bugs] [Bug 8367] How long is a hold waiting for pickup at a more granular level

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

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

Emmi Takkinen <emmi.takkinen at koha-suomi.fi> changed:

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

--- Comment #196 from Emmi Takkinen <emmi.takkinen at koha-suomi.fi> ---
Patches no longer apply.

Applying: Bug 8367: Add holds_pickup_period circulation rule
Using index info to reconstruct a base tree...
M       Koha/Hold.pm
M       koha-tmpl/intranet-tmpl/prog/en/modules/admin/smart-rules.tt
M       koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-reserve.tt
M       opac/opac-reserve.pl
Falling back to patching base and 3-way merge...
Auto-merging opac/opac-reserve.pl
Auto-merging koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-reserve.tt
Auto-merging koha-tmpl/intranet-tmpl/prog/en/modules/admin/smart-rules.tt
CONFLICT (content): Merge conflict in
koha-tmpl/intranet-tmpl/prog/en/modules/admin/smart-rules.tt
Auto-merging Koha/Hold.pm
error: Failed to merge in the changes.
Patch failed at 0001 Bug 8367: Add holds_pickup_period circulation rule
hint: Use 'git am --show-current-patch=diff' to see the failed 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-8367-Add-holdspickupperiod-circulation-rule-PsnpwK.patch

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