Remove obsolete conflict marker

This commit is contained in:
Pieter Vander Vennet 2022-04-28 00:44:49 +02:00
parent 6dd3711b5b
commit 3951b8d5c8

View file

@ -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