!8 111222333
Merge pull request !8 from 覃杰/auto-8533815-develop-1628504737287
This commit is contained in:
commit
e724bee36f
17
src/App.vue
17
src/App.vue
|
@ -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>
|
||||||
|
|
Loading…
Reference in New Issue