From e4f9eca9dd95babd0ffe185259935f303997b506 Mon Sep 17 00:00:00 2001
From: Pieter Vander Vennet <pietervdvn@gmail.com>
Date: Wed, 22 Jul 2020 15:56:43 +0200
Subject: [PATCH] Remove merge conflict

---
 UI/Base/Combine.ts | 2 +-
 index.ts           | 7 -------
 2 files changed, 1 insertion(+), 8 deletions(-)

diff --git a/UI/Base/Combine.ts b/UI/Base/Combine.ts
index 12b4338..649c497 100644
--- a/UI/Base/Combine.ts
+++ b/UI/Base/Combine.ts
@@ -21,7 +21,7 @@ export default class Combine extends UIElement {
         return elements;
     }
 
-    protected InnerUpdate(htmlElement: HTMLElement) {
+    InnerUpdate(htmlElement: HTMLElement) {
         for (const element of this.uiElements) {
             if (element instanceof UIElement) {
                 element.Update();
diff --git a/index.ts b/index.ts
index 6e3f8d6..b78d851 100644
--- a/index.ts
+++ b/index.ts
@@ -3,11 +3,7 @@ import {Changes} from "./Logic/Changes";
 import {ElementStorage} from "./Logic/ElementStorage";
 import {UIEventSource} from "./UI/UIEventSource";
 import {UserBadge} from "./UI/UserBadge";
-<<<<<<< HEAD
 import {Basemap, BaseLayers} from "./Logic/Basemap";
-=======
-import {BaseLayers, Basemap} from "./Logic/Basemap";
->>>>>>> 084a1d0c499c2d747ac5441aa8a6ce74f49ecf09
 import {PendingChanges} from "./UI/PendingChanges";
 import {CenterMessageBox} from "./UI/CenterMessageBox";
 import {Helpers} from "./Helpers";
@@ -331,7 +327,6 @@ const openFilterButton = `
 
 new CheckBox(new Combine([new LayerSelection(flayers), openFilterButton]), closedFilterButton).AttachTo("filter__selection")
 
-<<<<<<< HEAD
 // --------------- Setting up basemap dropdown --------
 
 let baseLayerOptions = [];
@@ -345,5 +340,3 @@ console.log(bm.CurrentLayer.data);
 
 
 new DropDown(`label`, baseLayerOptions, bm.CurrentLayer).AttachTo("filter__selection");
-=======
->>>>>>> 084a1d0c499c2d747ac5441aa8a6ce74f49ecf09