https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=33942
--- Comment #2 from Sam Lau <[email protected]> --- Using index info to reconstruct a base tree... M C4/Reserves.pm Falling back to patching base and 3-way merge... Auto-merging C4/Reserves.pm CONFLICT (content): Merge conflict in C4/Reserves.pm error: Failed to merge in the changes. Patch failed at 0001 Bug 33942: Improve performance of local holds priority by temporarily caching patrons and items -- You are receiving this mail because: You are watching all bug changes. _______________________________________________ Koha-bugs mailing list [email protected] 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/
