[Koha-bugs] [Bug 17996] longoverdue.pl should not set 'datereturned' when --mark-returned option is used.

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

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

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 #3 from Katrin Fischer <katrin.fischer at bsz-bw.de> ---
Changes in the patch are small and testing should be easy. Can you please
rebase?

Apply? [(y)es, (n)o, (i)nteractive] y
Applying: Bug 17996 - longoverdue.pl should not set 'datereturned' when
--mark-returned option is used
Using index info to reconstruct a base tree...
M       C4/Circulation.pm
Falling back to patching base and 3-way merge...
Auto-merging C4/Circulation.pm
CONFLICT (content): Merge conflict in C4/Circulation.pm
Failed to merge in the changes.
Patch failed at 0001 Bug 17996 - longoverdue.pl should not set 'datereturned'
when --mark-returned option is used
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-17996---longoverduepl-should-not-set-dateretur-IwbaAP.patch

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