# Conflicts: # pages/basics/basic-info/components/baseInfo.vue # pages/basics/basic-info/components/certificate.vue |
||
|---|---|---|
| .. | ||
| components | ||
| basic-info.vue | ||
| confirm.vue | ||
| entry.vue | ||
| home.vue | ||
| resignation.vue | ||
| user-info.vue | ||
# Conflicts: # pages/basics/basic-info/components/baseInfo.vue # pages/basics/basic-info/components/certificate.vue |
||
|---|---|---|
| .. | ||
| components | ||
| basic-info.vue | ||
| confirm.vue | ||
| entry.vue | ||
| home.vue | ||
| resignation.vue | ||
| user-info.vue | ||