https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=21284
David Nind <[email protected]> changed: What |Removed |Added ---------------------------------------------------------------------------- CC| |[email protected] Status|Needs Signoff |Patch doesn't apply --- Comment #8 from David Nind <[email protected]> --- Unit tests patch no longer applies - the rest of the test plan works as expected: root@007e9492a1aa:koha(bz21284)$ git bz apply 21284 Bug 21284 - ILS-DI: Allow GetPatronInfo to tell if a loaned item is on hold by someone else. 78269 - Bug 21284: Unit tests 90326 - Bug 21284: ILS-DI: Allow GetPatronInfo to tell if a loaned item is on hold by someone else. Apply? [(y)es, (n)o, (i)nteractive] y Applying: Bug 21284: Unit tests Using index info to reconstruct a base tree... M t/db_dependent/ILSDI_Services.t Falling back to patching base and 3-way merge... Auto-merging t/db_dependent/ILSDI_Services.t CONFLICT (content): Merge conflict in t/db_dependent/ILSDI_Services.t error: Failed to merge in the changes. Patch failed at 0001 Bug 21284: Unit tests -- 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/
