fix merge conflict

pull/1/head
Patrick Marsceill 3 years ago
parent d07d465005
commit 94f5d6b018
No known key found for this signature in database
GPG Key ID: 286B93882D828F40

@ -4,14 +4,10 @@
"assets/css/dark-mode-preview.scss",
"_sass/vendor/**/*.scss"
],
<<<<<<< HEAD
"extends": [
"stylelint-config-primer",
"stylelint-config-prettier"
],
=======
"extends": ["stylelint-prettier/recommended", "stylelint-config-primer"],
>>>>>>> c81862436316d38aea535163427d17f84e29343a
"plugins": ["stylelint-prettier"],
"rules": {
"prettier/prettier": true

Loading…
Cancel
Save