diff options
| author | Chocobozzz <me@florianbigard.com> | 2019-02-11 11:52:34 +0100 |
|---|---|---|
| committer | Chocobozzz <me@florianbigard.com> | 2019-02-11 11:52:34 +0100 |
| commit | 88108880bbdba473cfe36ecbebc1c3c4f972e102 (patch) | |
| tree | b242efb3b4f0d7e49d88f2d1f2063b5b3b0489c0 /tslint.json | |
| parent | 53a94c7cfa8368da4cd248d65df8346905938f0c (diff) | |
| parent | 9b712a2017e4ab3cf12cd6bd58278905520159d0 (diff) | |
| download | PeerTube-88108880bbdba473cfe36ecbebc1c3c4f972e102.tar.gz PeerTube-88108880bbdba473cfe36ecbebc1c3c4f972e102.tar.zst PeerTube-88108880bbdba473cfe36ecbebc1c3c4f972e102.zip | |
Merge branch 'develop' into pr/1217
Diffstat (limited to 'tslint.json')
| -rw-r--r-- | tslint.json | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tslint.json b/tslint.json index 92d0bd2b1..6828f4325 100644 --- a/tslint.json +++ b/tslint.json | |||
| @@ -4,7 +4,7 @@ | |||
| 4 | "await-promise": [true, "Bluebird"], | 4 | "await-promise": [true, "Bluebird"], |
| 5 | "no-inferrable-types": true, | 5 | "no-inferrable-types": true, |
| 6 | "eofline": true, | 6 | "eofline": true, |
| 7 | "indent": ["spaces"], | 7 | "indent": [true, "spaces"], |
| 8 | "ter-indent": [true, 2], | 8 | "ter-indent": [true, 2], |
| 9 | "max-line-length": [true, 140], | 9 | "max-line-length": [true, 140], |
| 10 | "no-unused-variable": false, // Memory issues | 10 | "no-unused-variable": false, // Memory issues |