[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

Alex Buckley <alexbuckley at catalyst.net.nz> changed:

           What    |Removed                     |Added
----------------------------------------------------------------------------
             Status|Needs Signoff               |Patch doesn't apply
                 CC|                            |alexbuckley at catalyst.net.nz

--- Comment #7 from Alex Buckley <alexbuckley at catalyst.net.nz> ---
Hi Tomas

Can you please merge your patches with master 

Apply? [(y)es, (n)o, (i)nteractive] i
Applying: Bug 15486: DB structure change
Applying: Bug 15486: DBIC update
Applying: Bug 15486: Make circ rules UI handle holds_per_day
Applying: Bug 15486: Unit tests
Using index info to reconstruct a base tree...
M       t/db_dependent/Holds.t
Falling back to patching base and 3-way merge...
Auto-merging t/db_dependent/Holds.t
CONFLICT (content): Merge conflict in t/db_dependent/Holds.t
Failed to merge in the changes.
Patch failed at 0001 Bug 15486: Unit tests
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-Unit-tests-3hLDmP.patch

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