Fix merge conflicts from develop

bhargav-kitchen · Aug 23, 2018 · def31b7 · def31b7
2 parents a871567 + 3d95916
commit def31b7
Show file tree

Hide file tree

Showing 31 changed files with 1,068 additions and 1,629 deletions.
diff --git a/.eslintrc → .eslintrc.json b/.eslintrc → .eslintrc.json
diff --git a/.jest.native.json b/.jest.native.json
@@ -3,11 +3,8 @@
   "globals": {
     "__DEV__": true
   },
-  "setupFiles": [
-    "<rootDir>/src/test/enzymeSetup.js"
-  ],
   "testRegex": "./src/native/test/.*.js$",
   "preset": "react-native",
   "testURL": "http://localhost",
   "testEnvironment": "jsdom"
-}
+}
diff --git a/.jest.primitives.json b/.jest.primitives.json
@@ -3,12 +3,12 @@
   "globals": {
     "__DEV__": true
   },
-  "setupFiles": [
-    "<rootDir>/src/test/enzymeSetup.js"
-  ],
   "testRegex": "./src/primitives/test/.*.js$",
-  "moduleFileExtensions": ["ios.js", "js"],
+  "moduleFileExtensions": [
+    "ios.js",
+    "js"
+  ],
   "preset": "react-native",
   "testURL": "http://localhost",
   "testEnvironment": "jsdom"
-}
+}
diff --git a/flow-typed/enzyme_v3.x.x.js b/flow-typed/enzyme_v3.x.x.js
diff --git a/flow-typed/npm/enzyme-adapter-react-16_vx.x.x.js b/flow-typed/npm/enzyme-adapter-react-16_vx.x.x.js
diff --git a/flow-typed/npm/enzyme_v3.x.x.js b/flow-typed/npm/enzyme_v3.x.x.js