From fc113852d37de33e8c9cc9ac39eed565f4fda06d Mon Sep 17 00:00:00 2001
From: Lauri Ojansivu <x@xet7.org>
Date: Thu, 27 Apr 2017 20:52:34 +0300
Subject: Add jsonroutes and winston.

---
 .eslintrc.json | 3 ---
 1 file changed, 3 deletions(-)

(limited to '.eslintrc.json')

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
   }
 }
-- 
cgit v1.2.3-1-g7c22