Fix some merge relicts

openego · Jun 27, 2022 · e6ac75b · e6ac75b
1 parent 0726e21
commit e6ac75b
Show file tree

Hide file tree

Showing 2 changed files with 0 additions and 7 deletions.
diff --git a/src/egon/data/datasets.yml b/src/egon/data/datasets.yml
@@ -1084,7 +1084,4 @@ emobility_mit:
   model_timeseries:
     reduce_memory: True
     export_results_to_csv: True
-<<<<<<< HEAD
-=======
     parallel_tasks: 10
->>>>>>> fix/#687-gas-demand-egon100RE
diff --git a/src/egon/data/db.py b/src/egon/data/db.py
@@ -163,11 +163,7 @@ def wrapped(*xs, **ks):
 
 
 def select_dataframe(sql, index_col=None, warning=True):
-<<<<<<< HEAD
-    """Select data from local database as pandas.DataFrame
-=======
     """ Select data from local database as pandas.DataFrame
->>>>>>> fix/#687-gas-demand-egon100RE
 
     Parameters
     ----------