merge

GoogleChrome · Jul 27, 2016 · 7a5aa4c · 7a5aa4c
1 parent 1dd50f3
commit 7a5aa4c
Showing 1 changed file with 1 addition and 4 deletions.
diff --git a/lighthouse-core/config/default.json b/lighthouse-core/config/default.json
@@ -17,11 +17,8 @@
       "speedline",
       "content-width",
       "cache-contents",
-<<<<<<< HEAD
-      "interstitial"
-=======
+      "interstitial",
       "geolocation-on-start"
->>>>>>> master
     ]
   },
   {