Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
22 commits
Select commit Hold shift + click to select a range
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 1 addition & 4 deletions .vscode/settings.json
Original file line number Diff line number Diff line change
@@ -1,8 +1,6 @@
{
<<<<<<< HEAD
"css.validate": false,
"scss.validate": false
=======
"scss.validate": false,
"files.exclude": {
"**/.git": false,
"**/.svn": true,
Expand All @@ -11,5 +9,4 @@
"**/.DS_Store": true,
"**/Thumbs.db": true
}
>>>>>>> master
}
Loading