reverted ts upgrade and specified eslintignore

TheManWhoStaresAtCode · Aug 5, 2020 · e8bc892 · e8bc892
1 parent 43c23b4
commit e8bc892
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git 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
diff --git 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
   }
 }