https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=40174
David Nind <[email protected]> changed: What |Removed |Added ---------------------------------------------------------------------------- CC| |[email protected] --- Comment #4 from David Nind <[email protected]> --- I attempted to test, but one of the dependent bugs doesn't apply: Apply? [(y)es, (n)o, (i)nteractive] y Applying: Bug 40173: Make http-client reusable from Cypress tests Applying: Bug 40173: Return the response early if the caller needs it Applying: Bug 40173: Add test for the api-client Cypress plugin Using index info to reconstruct a base tree... M t/cypress/plugins/index.js Falling back to patching base and 3-way merge... Auto-merging t/cypress/plugins/index.js CONFLICT (content): Merge conflict in t/cypress/plugins/index.js error: Failed to merge in the changes. Patch failed at 0001 Bug 40173: Add test for the api-client Cypress plugin However, it applies fine if I just apply it by itself. -- 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/
