From f8c484dfbf9282caa1dfe724ca63b49850bb78af Mon Sep 17 00:00:00 2001
From: Mike Grabowski <grabbou@gmail.com>
Date: Mon, 28 Jan 2019 15:02:13 +0100
Subject: [PATCH] Update Flow config

---
 .flowconfig         | 6 +-----
 .flowconfig.android | 6 +-----
 2 files changed, 2 insertions(+), 10 deletions(-)

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"