From 3951b8d5c8c8d474f5cabe477b6da68c6dbf38be Mon Sep 17 00:00:00 2001
From: pietervdvn <pietervdvn@posteo.net>
Date: Thu, 28 Apr 2022 00:44:49 +0200
Subject: [PATCH] Remove obsolete conflict marker

---
 Logic/Osm/Overpass.ts | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/Logic/Osm/Overpass.ts b/Logic/Osm/Overpass.ts
index a563c31bf9..b2205cb363 100644
--- a/Logic/Osm/Overpass.ts
+++ b/Logic/Osm/Overpass.ts
@@ -4,10 +4,6 @@ import {Utils} from "../../Utils";
 import {UIEventSource} from "../UIEventSource";
 import {BBox} from "../BBox";
 import * as osmtogeojson from "osmtogeojson";
-<<<<<<< HEAD
-
-=======
->>>>>>> b54b5061cc72488ceb007177275fb600cce0a0dd
 
 /**
  * Interfaces overpass to get all the latest data