bug fix merge conflict

SabineHaas · SabineHaas · commit dd4b82072566 · 2019-07-10T16:59:49.000+02:00
diff --git a/windpowerlib/wind_farm.py b/windpowerlib/wind_farm.py
@@ -11,7 +11,7 @@
 from windpowerlib import tools, power_curves
 import numpy as np
 import pandas as pd
-import warnings
+import logging
 
 
 class WindFarm(object):
