https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=23395
David Nind <da...@davidnind.com> changed: What |Removed |Added ---------------------------------------------------------------------------- Status|Needs Signoff |Patch doesn't apply CC| |da...@davidnind.com --- Comment #6 from David Nind <da...@davidnind.com> --- Patch no longer applies: Apply? [(y)es, (n)o, (i)nteractive] y Applying: Bug 23395: Unit tests Using index info to reconstruct a base tree... M t/db_dependent/Koha/Plugins/Biblio_and_Items_plugin_hooks.t Falling back to patching base and 3-way merge... Auto-merging t/db_dependent/Koha/Plugins/Biblio_and_Items_plugin_hooks.t CONFLICT (content): Merge conflict in t/db_dependent/Koha/Plugins/Biblio_and_Items_plugin_hooks.t error: Failed to merge in the changes. Patch failed at 0001 Bug 23395: Unit tests -- 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/