Skip to content

Commit 3470cb5

Browse files
committed
chore: fixed mypy errors
Signed-off-by: rohansen856 <rohansen856@gmail.com>
1 parent a704bb0 commit 3470cb5

1 file changed

Lines changed: 0 additions & 4 deletions

File tree

tests/test_openml/test_config.py

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -127,12 +127,8 @@ def test_switch_from_example_configuration(self):
127127

128128
openml.config.start_using_configuration_for_example()
129129
openml.config.stop_using_configuration_for_example()
130-
<<<<<<< studies-migration
131-
openml.config.servers = openml.config.get_servers("production")
132-
=======
133130
assert openml.config.apikey == TestBase.user_key
134131
assert openml.config.server == self.production_server
135-
>>>>>>> main
136132

137133
def test_example_configuration_stop_before_start(self):
138134
"""Verifies an error is raised if `stop_...` is called before `start_...`."""

0 commit comments

Comments
 (0)