Fix wrongly solved merge conflict

Author: uvchik

tests/test_wind_turbine.py

@@ -38,23 +38,6 @@ def test_get_turbine_data_from_file(self):
         with pytest.raises(FileNotFoundError):
             get_turbine_data_from_file(turbine_type="...", path="not_existent")
 
-    def test_get_turbine_types(self, capsys):
-        get_turbine_types()
-        captured = capsys.readouterr()
-        assert "Enercon" in captured.out
-        get_turbine_types("oedb", print_out=False, filter_=False)
-        msg = "`turbine_library` is 'wrong' but must be 'local' or 'oedb'."
-        with pytest.raises(ValueError, match=msg):
-            get_turbine_types("wrong")
-
-    def test_wrong_url_load_turbine_data(self):
-        """Load turbine data from oedb."""
-
-        with pytest.raises(
-            ConnectionError, match="Database connection not successful"
-        ):
-            load_turbine_data_from_oedb("wrong_schema")
-
     @pytest.mark.filterwarnings("ignore:The WindTurbine")
     def test_string_representation_of_wind_turbine(self):
         assert "Wind turbine: ['hub height=120 m'" in repr(WindTurbine(120))