From e8bc8922562e22111419eb0fe8fc53346a9ad7d9 Mon Sep 17 00:00:00 2001
From: Kian Attari <kattari@slack-corp.com>
Date: Mon, 6 Jul 2020 11:30:42 -0400
Subject: [PATCH] reverted ts upgrade and specified eslintignore

---
 .eslintignore | 2 +-
 package.json  | 4 ++++
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/.eslintignore b/.eslintignore
index 3fa632304..d079d1063 100644
--- a/.eslintignore
+++ b/.eslintignore
@@ -1,6 +1,6 @@
 # builtin file has a lot of formatting issues 
 builtin.ts
 
-**/*.spec.ts 
+src/**/*.spec.ts 
 
 src/test-helpers.ts
\ No newline at end of file
diff --git a/package.json b/package.json
index c60acd3fd..88b4242a4 100644
--- a/package.json
+++ b/package.json
@@ -77,10 +77,14 @@
     "ts-node": "^8.1.0",
     "tsd": "^0.13.1",
     "tslint": "^5.15.0",
+<<<<<<< HEAD
     "tslint-config-airbnb": "^5.11.1",
     "typescript": "^3.7.2"
   },
   "tsd": {
     "directory": "types-tests"
+=======
+    "typescript": "^3.7.2"
+>>>>>>> reverted ts upgrade and specified eslintignore
   }
 }