Skip to content

Commit

Permalink
Fix merge conflict
Browse files Browse the repository at this point in the history
  • Loading branch information
Stefan Kuethe committed Feb 6, 2024
2 parents 6f09cf9 + f50c4d4 commit d9685e5
Showing 1 changed file with 2 additions and 8 deletions.
10 changes: 2 additions & 8 deletions docs/examples/airports/app.py
Original file line number Diff line number Diff line change
@@ -1,14 +1,8 @@
import sys

import pandas as pd
from maplibre import (
Layer,
LayerType,
Map,
MapOptions,
output_maplibregl,
render_maplibregl,
)
from maplibre import (Layer, LayerType, Map, MapOptions, output_maplibregl,
render_maplibregl)
from maplibre.basemaps import Carto
from maplibre.controls import Marker, MarkerOptions, Popup, PopupOptions
from maplibre.sources import GeoJSONSource
Expand Down

0 comments on commit d9685e5

Please sign in to comment.