fix conflict

This commit is contained in:
2021-08-23 15:13:20 +02:00
2 changed files with 4 additions and 2 deletions

View File

@@ -1,4 +1,4 @@
---
id: slide9
id: slide10
img: ./tomochain.png
---

View File

@@ -15,6 +15,7 @@
"@gridsome/transformer-remark": "^0.6.2",
"@noxify/gridsome-remark-classes": "^1.0.0",
"@noxify/gridsome-remark-table-align": "^1.0.0",
"autoprefixer": "^10.3.2",
"axios": "^0.21.1",
"babel-runtime": "^6.26.0",
"core-js": "^3.6.5",
@@ -28,8 +29,9 @@
"lodash": "^4.17.20",
"node-sass": "^5.0.0",
"pluralize": "^8.0.0",
"postcss": "^8.3.6",
"sass-loader": "^10.0.2",
"tailwindcss": "^1.8.4",
"tailwindcss": "^2.2.7",
"tailwindcss-gradients": "^3.0.0",
"tailwindcss-tables": "^0.4.0",
"v-tooltip": "^2.0.3",