[Koha-bugs] [Bug 14866] Make high holds work with different item types and number of open days

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

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

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

           What    |Removed                     |Added
----------------------------------------------------------------------------
             Status|Needs Signoff               |Patch doesn't apply
                 CC|                            |katrin.fischer at bsz-bw.de

--- Comment #6 from Katrin Fischer <katrin.fischer at bsz-bw.de> ---
Patch no longer applies, can you please rebase?
It also seems to be missing tests?

Apply? [(y)es, (n)o, (i)nteractive] y
Applying: Bug 14866: Make high holds work with different item types
.git/rebase-apply/patch:80: trailing whitespace.
                            <td>[% rule.decreaseloanholds %]</td>               
warning: 1 line adds whitespace errors.
Using index info to reconstruct a base tree...
M       C4/Circulation.pm
M       admin/smart-rules.pl
M       koha-tmpl/intranet-tmpl/prog/en/modules/admin/smart-rules.tt
.git/rebase-apply/patch:80: trailing whitespace.
                            <td>[% rule.decreaseloanholds %]</td>               
warning: 1 line applied after fixing whitespace errors.
Falling back to patching base and 3-way merge...
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 admin/smart-rules.pl
CONFLICT (content): Merge conflict in admin/smart-rules.pl
Auto-merging C4/Circulation.pm
error: Failed to merge in the changes.
Patch failed at 0001 Bug 14866: Make high holds work with different item types
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-14866-Make-high-holds-work-with-different-item-RnFis7.patch

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