From 1926f9ab062eba4222d45ca712eaf656bb84b0c2 Mon Sep 17 00:00:00 2001
From: Flarnie Marchan <flarnie@fb.com>
Date: Fri, 21 Apr 2017 12:56:54 -0700
Subject: [PATCH] Quick fix for flowconfig

We had a merge conflict sneak in somewhere, and also want to ignore the
'addons' directory.
---
 .flowconfig | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/.flowconfig b/.flowconfig
index 1b15b4d7d2..3a962f8881 100644
--- a/.flowconfig
+++ b/.flowconfig
@@ -1,14 +1,12 @@
 [ignore]
 
-<<<<<<< HEAD
 <PROJECT_ROOT>/examples/.*
-=======
 <PROJECT_ROOT>/fixtures/.*
->>>>>>> 4a37718... Remove examples/ folder (#9323)
 <PROJECT_ROOT>/build/.*
 <PROJECT_ROOT>/.*/node_modules/y18n/.*
 <PROJECT_ROOT>/.*/__mocks__/.*
 <PROJECT_ROOT>/.*/__tests__/.*
+<PROJECT_ROOT>/addons/.*
 
 # Ignore Docs
 <PROJECT_ROOT>/docs/.*