Facebook/react
1
0
Fork 0
mirror of https://github.com/facebook/react.git synced 2025-11-01 09:12:30 +00:00
Code Issues Packages Projects Releases Wiki Activity

Quick fix for flowconfig

Browse Source 
We had a merge conflict sneak in somewhere, and also want to ignore the
'addons' directory.
This commit is contained in:
Flarnie Marchan
2017-04-21 12:56:54 -07:00
parent a6b51ed8fb
commit 1926f9ab06
1 changed files with 1 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.flowconfig
+1 -3
View File
@@ -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/.*