diff options
| author | Lauri Ojansivu <x@xet7.org> | 2017-04-27 20:52:34 +0300 |
|---|---|---|
| committer | Lauri Ojansivu <x@xet7.org> | 2017-04-27 20:52:34 +0300 |
| commit | fc113852d37de33e8c9cc9ac39eed565f4fda06d (patch) | |
| tree | ce958a90e9e13950795fbe52de5b87292f7433fc /.eslintrc.json | |
| parent | 0319bcf7bb090328e67766234723f5986c00bba2 (diff) | |
| download | wekan-fc113852d37de33e8c9cc9ac39eed565f4fda06d.tar.gz wekan-fc113852d37de33e8c9cc9ac39eed565f4fda06d.tar.bz2 wekan-fc113852d37de33e8c9cc9ac39eed565f4fda06d.zip | |
Add jsonroutes and winston.
Diffstat (limited to '.eslintrc.json')
| -rw-r--r-- | .eslintrc.json | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/.eslintrc.json b/.eslintrc.json index 3fbab2d1..0e2fd495 100644 --- a/.eslintrc.json +++ b/.eslintrc.json @@ -125,10 +125,7 @@ "Checklists": true, "Settings": true, "InvitationCodes": true, -<<<<<<< HEAD "Winston":true -======= "JsonRoutes" : true ->>>>>>> 3a5150f6eef86816471f7b0134d3d93cf6686413 } } |