Skip to content

bdc / bdcjg-web

Go to a project
Toggle navigation
Toggle navigation pinning
4e621960 by xiaomiao
Options

--no commit message

1 parent 29f6160b
Expand all
Inline Side-by-side
Showing 2 changed files with 0 additions and 4 deletions
......@@ -408,9 +408,5 @@ export default {
};
</script>
<style scoped lang="scss">
<<<<<<< HEAD
@import "~@/styles/mixin.scss";
=======
@import "~@/styles/mixin.scss";
>>>>>>> 7c233183698a503df659c8b6cf28f340f4de3587
</style>
......