https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=35392
--- Comment #11 from Jonathan Druart <[email protected]> --- (In reply to Jonathan Druart from comment #8) > Well, maybe not, they seem related. > > I am getting a conflict on the second patch however > > Applying: Bug 35392: Move usage-reports store into erm store > error: sha1 information is lacking or useless > (koha-tmpl/intranet-tmpl/prog/js/vue/stores/usage-reports.js). It's actually on the third patch Applying: Bug 35392: New getDialoJobEnqueueMessage Using index info to reconstruct a base tree... M koha-tmpl/intranet-tmpl/prog/js/vue/components/ERM/UsageStatisticsDataProvidersList.vue Falling back to patching base and 3-way merge... Auto-merging koha-tmpl/intranet-tmpl/prog/js/vue/components/ERM/UsageStatisticsDataProvidersList.vue CONFLICT (content): Merge conflict in koha-tmpl/intranet-tmpl/prog/js/vue/components/ERM/UsageStatisticsDataProvidersList.vue -- 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/
