thang
/
notes
mirror of https://github.com/thangisme/notes.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

fix merge conflict

This commit is contained in:
Patrick Marsceill 2020-04-24 15:19:49 -04:00
parent d07d465005
commit 94f5d6b018
No known key found for this signature in database
GPG Key ID: 286B93882D828F40
1 changed files with 0 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
.stylelintrc.json
View File

@ -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