https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=38770
David Nind <[email protected]> changed: What |Removed |Added ---------------------------------------------------------------------------- Status|Signed Off |Patch doesn't apply --- Comment #10 from David Nind <[email protected]> --- The patch no longer applies 8-(... git bz apply 38770 Bug 38770 - Remove @vue/cli-service and babel 175948 - Bug 38770: [DO NOT PUSH] yarn.lock changes 176114 - Bug 38770: Remove @vue/cli-service and babel Apply? [(y)es, (n)o, (i)nteractive] y Applying: Bug 38770: [DO NOT PUSH] yarn.lock changes Applying: Bug 38770: Remove @vue/cli-service and babel Using index info to reconstruct a base tree... M package.json 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 Auto-merging package.json error: Failed to merge in the changes. Patch failed at 0001 Bug 38770: Remove @vue/cli-service and babel -- 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/
