Merge pull request !8 from 覃杰/auto-8533815-develop-1628504737287
This commit is contained in:
覃杰 2021-08-09 10:26:33 +00:00 committed by Gitee
commit e724bee36f
1 changed files with 6 additions and 11 deletions

View File

@ -1,23 +1,18 @@
<template> <template>
<div id="app"> <div id="app">
<<<<<<< HEAD <el-button type="success">成功按钮111222333</el-button>
<el-button type="success">成功</el-button>
<hello-world></hello-world>
=======
<el-button type="success">成功按钮111</el-button>
>>>>>>> 497212fe5a5e7e56b87cff7e44a9a2f9e6ff8857
</div> </div>
</template> </template>
<script> <script>
import HelloWorld from '@/components/HelloWorld.vue' import HelloWorld from "@/components/HelloWorld.vue";
export default { export default {
name: 'Home', name: "Home",
components: { components: {
HelloWorld HelloWorld,
} },
} };
</script> </script>
<style> <style>