https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=10190
Chloé Zermatten <[email protected]> changed: What |Removed |Added ---------------------------------------------------------------------------- Status|Patch doesn't apply |Needs Signoff --- Comment #222 from Chloé Zermatten <[email protected]> --- (In reply to Clemens Tubach from comment #206) > The patch doesn't apply: > > Applying: Bug 10190: Complete Vue.js rewrite of Circulation Triggers > administration interface > Using index info to reconstruct a base tree... > M debian/templates/apache-shared-intranet.conf > M koha-tmpl/intranet-tmpl/prog/en/modules/admin/admin-home.tt > M koha-tmpl/intranet-tmpl/prog/js/fetch/item-api-client.js > M koha-tmpl/intranet-tmpl/prog/js/fetch/patron-api-client.js > M koha-tmpl/intranet-tmpl/prog/js/vue/fetch/api-client.js > M rspack.config.js > Falling back to patching base and 3-way merge... > Auto-merging rspack.config.js > CONFLICT (content): Merge conflict in rspack.config.js > Auto-merging koha-tmpl/intranet-tmpl/prog/js/vue/fetch/api-client.js > Auto-merging koha-tmpl/intranet-tmpl/prog/js/fetch/patron-api-client.js > CONFLICT (content): Merge conflict in > koha-tmpl/intranet-tmpl/prog/js/fetch/patron-api-client.js > Auto-merging koha-tmpl/intranet-tmpl/prog/js/fetch/item-api-client.js > CONFLICT (content): Merge conflict in > koha-tmpl/intranet-tmpl/prog/js/fetch/item-api-client.js > Auto-merging koha-tmpl/intranet-tmpl/prog/en/modules/admin/admin-home.tt > Auto-merging debian/templates/apache-shared-intranet.conf > error: Failed to merge in the changes. > Patch failed at 0001 Bug 10190: Complete Vue.js rewrite of Circulation > Triggers administration interface Thanks for letting me know! Rebase done; hopefully it should apply now :) If not, I can take another look. -- 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/
