From df8a31278701227cbe053698d6bbb728d15cb89b Mon Sep 17 00:00:00 2001
From: Matt Zeunert <matt@mostlystatic.com>
Date: Thu, 15 Nov 2018 09:37:28 +0000
Subject: [PATCH] update snapshot

---
 lighthouse-cli/test/cli/__snapshots__/index-test.js.snap | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/lighthouse-cli/test/cli/__snapshots__/index-test.js.snap b/lighthouse-cli/test/cli/__snapshots__/index-test.js.snap
index 01a4119e2d7e..7f442b9f72d9 100644
--- a/lighthouse-cli/test/cli/__snapshots__/index-test.js.snap
+++ b/lighthouse-cli/test/cli/__snapshots__/index-test.js.snap
@@ -1122,15 +1122,9 @@ Object {
         Object {
           "path": "seo/robots-txt",
         },
-<<<<<<< HEAD
         Object {
           "path": "seo/tap-targets",
         },
-        Object {
-          "path": "fonts",
-        },
-=======
->>>>>>> master
       ],
       "networkQuietThresholdMs": 1000,
       "passName": "defaultPass",