https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=29102
David Nind <[email protected]> changed: What |Removed |Added ---------------------------------------------------------------------------- CC| |[email protected] --- Comment #8 from David Nind <[email protected]> --- Patch no longer applies 8-(.. Apply? [(y)es, (n)o, (i)nteractive] y Applying: Bug 29102: Unit tests Using index info to reconstruct a base tree... M t/db_dependent/DecreaseLoanHighHolds.t Falling back to patching base and 3-way merge... Auto-merging t/db_dependent/DecreaseLoanHighHolds.t Applying: Bug 29102: Do not count patron's own hold against limits Using index info to reconstruct a base tree... M C4/Circulation.pm M t/db_dependent/DecreaseLoanHighHolds.t Falling back to patching base and 3-way merge... Auto-merging t/db_dependent/DecreaseLoanHighHolds.t CONFLICT (content): Merge conflict in t/db_dependent/DecreaseLoanHighHolds.t 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 29102: Do not count patron's own hold against limits -- 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/
