fix(repo): increase flow merge timeout (#2514)

attempt to fix timeout in Travis by increasing flow merge timeout from 100s to 300s
Opentrons · Oct 19, 2018 · b1ba303 · b1ba303
1 parent cb3d12e
commit b1ba303
Showing 1 changed file with 1 addition and 0 deletions.
diff --git a/.flowconfig b/.flowconfig
@@ -18,5 +18,6 @@ update-server/.*
 [options]
 module.name_mapper='^default\-containers\.json$' -> '@opentrons/components/interfaces/default-containers.json.js'
 module.name_mapper.extension='css' -> '@opentrons/components/interfaces/CSSModule.js'
+merge_timeout=300
 
 [strict]