[Koha-bugs] [Bug 8137] Checkout limit for all libraries

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

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

Lisette Scheer <lisette.scheer at bywatersolutions.com> changed:

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

--- Comment #106 from Lisette Scheer <lisette.scheer at bywatersolutions.com> ---
Applying: Bug 8137: Add 'global' has_priority rules for checkouts
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:315: new blank line at EOF.
+
warning: 1 line adds 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
Auto-merging C4/Circulation.pm
error: Failed to merge in the changes.
Patch failed at 0001 Bug 8137: Add 'global' has_priority rules for checkouts

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