From 1049d4bae42f2810ce14075f32289d8b0bd8ea82 Mon Sep 17 00:00:00 2001
From: vershwal <vershwal.princi@gmail.com>
Date: Mon, 18 Jun 2018 01:57:51 +0530
Subject: [PATCH] resolving merge conflicts

---
 modules/renderer/background.js | 1 +
 modules/svg/layers.js          | 3 ---
 2 files changed, 1 insertion(+), 3 deletions(-)

diff --git a/modules/renderer/background.js b/modules/renderer/background.js
index fcead675b..4dfeb2d82 100644
--- a/modules/renderer/background.js
+++ b/modules/renderer/background.js
@@ -169,6 +169,7 @@ export function rendererBackground(context) {
         var streetside = context.layers().layer('streetside');
         if (streetside && streetside.enabled()) {
             imageryUsed.push('Bing Streetside');
+        }
 
         var mvt = context.layers().layer('mvt');
         if (mvt && mvt.enabled() && mvt.hasMvt()) {
diff --git a/modules/svg/layers.js b/modules/svg/layers.js
index a14386ff7..b86581f9a 100644
--- a/modules/svg/layers.js
+++ b/modules/svg/layers.js
@@ -9,11 +9,8 @@ import { select as d3_select } from 'd3-selection';
 
 import { svgDebug } from './debug';
 import { svgGpx } from './gpx';
-<<<<<<< HEAD
 import { svgStreetside } from './streetside';
-=======
 import { svgMvt } from './mvt';
->>>>>>> 9b88bc9d1... button works with .gpx
 import { svgMapillaryImages } from './mapillary_images';
 import { svgMapillarySigns } from './mapillary_signs';
 import { svgOpenstreetcamImages } from './openstreetcam_images';