Remove obsolete conflict marker
This commit is contained in:
parent
6dd3711b5b
commit
3951b8d5c8
1 changed files with 0 additions and 4 deletions
|
@ -4,10 +4,6 @@ import {Utils} from "../../Utils";
|
||||||
import {UIEventSource} from "../UIEventSource";
|
import {UIEventSource} from "../UIEventSource";
|
||||||
import {BBox} from "../BBox";
|
import {BBox} from "../BBox";
|
||||||
import * as osmtogeojson from "osmtogeojson";
|
import * as osmtogeojson from "osmtogeojson";
|
||||||
<<<<<<< HEAD
|
|
||||||
|
|
||||||
=======
|
|
||||||
>>>>>>> b54b5061cc72488ceb007177275fb600cce0a0dd
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Interfaces overpass to get all the latest data
|
* Interfaces overpass to get all the latest data
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue