# Conflicts: # src/router/index.ts # src/views/tasks/TaskDetailView.vue |
||
|---|---|---|
| .. | ||
| components | ||
| custom-properties | ||
| theme | ||
| common-imports.scss | ||
| fonts.scss | ||
| global.scss | ||
| mixins.scss | ||
| transitions.scss | ||
# Conflicts: # src/router/index.ts # src/views/tasks/TaskDetailView.vue |
||
|---|---|---|
| .. | ||
| components | ||
| custom-properties | ||
| theme | ||
| common-imports.scss | ||
| fonts.scss | ||
| global.scss | ||
| mixins.scss | ||
| transitions.scss | ||