fix merge conflicts

microsoft · Jan 31, 2024 · 9727a13 · 9727a13
1 parent 7e2040a
commit 9727a13
Showing 1 changed file with 1 addition and 0 deletions.
diff --git a/pythonFiles/tests/pytestadapter/expected_discovery_test_output.py b/pythonFiles/tests/pytestadapter/expected_discovery_test_output.py
@@ -916,6 +916,7 @@
     ],
     "id_": str(TEST_DATA_PATH),
 }
+
 TEST_MULTI_CLASS_NEST_PATH = TEST_DATA_PATH / "test_multi_class_nest.py"
 
 nested_classes_expected_test_output = {