fix merge

c3be6150 · Lukas Eller · 9ef0845e · c3be6150
Commit c3be6150 authored Apr 13, 2021 by Lukas Eller
Show whitespace changes
Inline Side-by-side

Showing with 0 additions and 7 deletions

plotting.py measprocess/plotting.py +0 -7

No files found.
--- a/measprocess/plotting.py
+++ b/measprocess/plotting.py
@@ -18,13 +18,6 @@ def plot_series_osm(gps_series : gpd.GeoSeries, c_series : np.ndarray = None, zo
    if gps_series.crs != "EPSG:4326":
        raise ValueError("Make sure to pass data with EPSG:4326 projection")

-<<<<<<< HEAD
-=======
-    '''
-    Make a very simple test
-    '''
-
->>>>>>> acf279e246eb4d95cc291cda8b61e11cd7773375
    request = cimgt.OSM()
    extent = gps_series.total_bounds[[0, 2, 1, 3]]
    plt.figure(figsize=fig_size)