diff options
-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 } } |