https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=32476
Olivier Hubert <olivier.hub...@inlibro.com> changed:
What |Removed |Added
----------------------------------------------------------------------------
CC| |olivier.hub...@inlibro.com
Status|Needs Signoff |Patch doesn't apply
--- Comment #18 from Olivier Hubert <olivier.hub...@inlibro.com> ---
Applying: Bug 32476: Add caching for relatively expensive patron methods
Using index info to reconstruct a base tree...
M C4/Circulation.pm
M Koha/Patron.pm
Falling back to patching base and 3-way merge...
Auto-merging Koha/Patron.pm
Auto-merging C4/Circulation.pm
CONFLICT (content): Merge conflict in C4/Circulation.pm
error: Failed to merge in the changes.
Patch failed at 0001 Bug 32476: Add caching for relatively expensive patron
methods
--
You are receiving this mail because:
You are watching all bug changes.
_______________________________________________
Koha-bugs mailing list
Koha-bugs@lists.koha-community.org
https://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/
