Browse Source

Add jsonroutes and winston.

Lauri Ojansivu 8 years ago
parent
commit
fc113852d3
1 changed files with 0 additions and 3 deletions
  1. 0 3
      .eslintrc.json

+ 0 - 3
.eslintrc.json

@@ -125,10 +125,7 @@
     "Checklists": true,
     "Settings": true,
     "InvitationCodes": true,
-<<<<<<< HEAD
     "Winston":true
-=======
     "JsonRoutes" : true
->>>>>>> 3a5150f6eef86816471f7b0134d3d93cf6686413
   }
 }