diff --git a/.flowconfig b/.flowconfig index bbbdb976925..ace10eacf9c 100644 --- a/.flowconfig +++ b/.flowconfig @@ -98,11 +98,7 @@ untyped-import untyped-type-import [version] -<<<<<<< HEAD -^0.85.0 +^0.86.0 [untyped] .*/node_modules/metro/.* -======= -^0.86.0 ->>>>>>> parent of b864e7e63e... Revert "Merge branch 'master' into 0.58-stable" diff --git a/.flowconfig.android b/.flowconfig.android index 48c6c713312..49de66e3b9f 100644 --- a/.flowconfig.android +++ b/.flowconfig.android @@ -98,11 +98,7 @@ untyped-import untyped-type-import [version] -<<<<<<< HEAD -^0.85.0 +^0.86.0 [untyped] .*/node_modules/metro/.* -======= -^0.86.0 ->>>>>>> parent of b864e7e63e... Revert "Merge branch 'master' into 0.58-stable"