[Koha-bugs] [Bug 21628] Simplify holds awaiting pickup report

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

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

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 #2 from Alex Buckley <alexbuckley at catalyst.net.nz> ---
Hi Nick 

Can you please rebase your patch, it is failing on waitingreserves.tt

Applying: Bug 21628: Simplify holds awating pickup report
Using index info to reconstruct a base tree...
M       koha-tmpl/intranet-tmpl/prog/en/modules/circ/waitingreserves.tt
Falling back to patching base and 3-way merge...
Auto-merging koha-tmpl/intranet-tmpl/prog/en/modules/circ/waitingreserves.tt
CONFLICT (content): Merge conflict in
koha-tmpl/intranet-tmpl/prog/en/modules/circ/waitingreserves.tt
Failed to merge in the changes.
Patch failed at 0001 Bug 21628: Simplify holds awating pickup report
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-21628-Simplify-holds-awating-pickup-report-eTjzAf.patch
You have new mail in /var/mail/vagrant

Cheers,
Alex

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