https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=15156 Hakam Almotlak <hakam.almotlak@inLibro.com> changed: What |Removed |Added ---------------------------------------------------------------------------- CC| |hakam.almotlak@inLibro.com --- Comment #20 from Hakam Almotlak <hakam.almotlak@inLibro.com> --- patch does not apply on master Applying: Bug 15156: Get all patrons with owings Using index info to reconstruct a base tree... M Koha/Patrons.pm M t/db_dependent/Koha/Patrons.t Falling back to patching base and 3-way merge... Auto-merging t/db_dependent/Koha/Patrons.t CONFLICT (content): Merge conflict in t/db_dependent/Koha/Patrons.t Auto-merging Koha/Patrons.pm error: Failed to merge in the changes. Patch failed at 0001 Bug 15156: Get all patrons with owings -- You are receiving this mail because: You are watching all bug changes.