From 382b3a11b66bd6f3f446415d0508d3cd23ca675d Mon Sep 17 00:00:00 2001
From: Dmitrii Abramov <dmitrii@abramov.io>
Date: Thu, 27 Jul 2017 11:43:40 -0700
Subject: [PATCH] fix merge conflict

---
 test_utils.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/test_utils.js b/test_utils.js
index 94aa107ad487..72eedae13961 100644
--- a/test_utils.js
+++ b/test_utils.js
@@ -22,6 +22,7 @@ const DEFAULT_GLOBAL_CONFIG: GlobalConfig = {
   coverageReporters: [],
   coverageThreshold: {global: {}},
   expand: false,
+  findRelatedTests: false,
   forceExit: false,
   json: false,
   lastCommit: false,