Skip to content

Commit

Permalink
Merge remote-tracking branch 'refs/remotes/origin/vue3-update-rc' int…
Browse files Browse the repository at this point in the history
…o fix-list-components-and-infine-scroll-directive

# Conflicts:
#	packages/x-components/src/components/global-x-bus.vue
#	packages/x-components/src/views/home/Home.vue
  • Loading branch information
joseacabaneros committed Jul 25, 2024
2 parents 942130b + a485dea commit 6a612ab
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion packages/x-components/src/components/global-x-bus.vue
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@
});
});
return {};
return () => '';
}
});
</script>
Expand Down

0 comments on commit 6a612ab

Please sign in to comment.