Skip to content
This repository has been archived by the owner on Jul 21, 2022. It is now read-only.

Conflict fix #53

Merged
merged 2 commits into from
Jun 1, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
16 changes: 2 additions & 14 deletions .eslintrc.json
Original file line number Diff line number Diff line change
Expand Up @@ -14,21 +14,9 @@
"sourceType": "module"
},
"plugins": [
"eta",
"html"
"@typescript-eslint"
],
"settings": {
"html/html-extensions": [".html", ".eta"]
},
"rules": {
"@typescript-eslint/no-var-requires": 0
},
"overrides": [
{
"files": [
"*.eta"
],
"processor": "eta/eta"
}
]
}
}
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -3,3 +3,4 @@ dist/
data/
.env
log.txt
.vscode
5 changes: 0 additions & 5 deletions .vscode/settings.json

This file was deleted.

Loading