resolve conflict
Showing
components/DateDisplay.vue
0 → 100644
... | @@ -16,6 +16,7 @@ | ... | @@ -16,6 +16,7 @@ |
"@nuxtjs/axios": "^5.13.6", | "@nuxtjs/axios": "^5.13.6", | ||
"@nuxtjs/toast": "^3.3.1", | "@nuxtjs/toast": "^3.3.1", | ||
"@pinia/nuxt": "^0.4.6", | "@pinia/nuxt": "^0.4.6", | ||
"axios": "^1.0.0-alpha.1", | |||
"core-js": "^3.25.3", | "core-js": "^3.25.3", | ||
"nuxt": "^2.15.8", | "nuxt": "^2.15.8", | ||
"pinia": "^2.0.29", | "pinia": "^2.0.29", | ||
... | ... |
plugins/formatTime.js
0 → 100644
This source diff could not be displayed because it is too large. You can view the blob instead.
Please register or sign in to comment