Commit 37bf5f502820973a241db3722208ac7723f678cd
1 parent
6b411fe4
conflict
Showing
1 changed file
with
0 additions
and
5 deletions
src/main.ts
| 1 | import { createApp } from 'vue' | 1 | import { createApp } from 'vue' |
| 2 | import App from './App.vue' | 2 | import App from './App.vue' |
| 3 | import router from '@/router/index' | 3 | import router from '@/router/index' |
| 4 | -<<<<<<< HEAD | ||
| 5 | -// import store from '@/store/index' | ||
| 6 | -import store from '@/pinia/index' | ||
| 7 | -======= | ||
| 8 | import promise from 'es6-promise' | 4 | import promise from 'es6-promise' |
| 9 | // import store from '@/store/index' | 5 | // import store from '@/store/index' |
| 10 | 6 | ||
| 11 | ->>>>>>> dev | ||
| 12 | import ElementPlus from 'element-plus' | 7 | import ElementPlus from 'element-plus' |
| 13 | import { ElMessage, ElMessageBox } from 'element-plus' | 8 | import { ElMessage, ElMessageBox } from 'element-plus' |
| 14 | import 'element-plus/dist/index.css' | 9 | import 'element-plus/dist/index.css' |