https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=17229
Héctor Eduardo Castro Avalos <hector.hecax...@gmail.com> changed:
What |Removed |Added
----------------------------------------------------------------------------
CC| |hector.hecax...@gmail.com
Status|Needs Signoff |Patch doesn't apply
--- Comment #3 from Héctor Eduardo Castro Avalos <hector.hecax...@gmail.com> ---
Hi Julian
Sorry but patch does not apply anymore
Applying: Bug 17229: Check if patron is expired in CanItemBeReserved
Using index info to reconstruct a base tree...
Falling back to patching base and 3-way merge...
Auto-merging C4/Reserves.pm
CONFLICT (content): Merge conflict in C4/Reserves.pm
Failed to merge in the changes.
Patch failed at 0001 Bug 17229: Check if patron is expired in CanItemBeReserved
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-17229-Check-if-patron-is-expired-in-CanItemBeR-oomixj.patch
You should do this one dependent of bug 16246
--
You are receiving this mail because:
You are watching all bug changes.
_______________________________________________
Koha-bugs mailing list
Koha-bugs@lists.koha-community.org
http://lists.koha-community.org/cgi-bin/mailman/listinfo/koha-bugs
website : http://www.koha-community.org/
git : http://git.koha-community.org/
bugs : http://bugs.koha-community.org/
