fix merge conflicts

microsoft · Dec 19, 2023 · a624bec · a624bec
1 parent 8d67595
commit a624bec
Showing 1 changed file with 5 additions and 0 deletions.
diff --git a/pythonFiles/tests/pytestadapter/expected_discovery_test_output.py b/pythonFiles/tests/pytestadapter/expected_discovery_test_output.py
@@ -911,6 +911,11 @@
                         "test_yaml.yaml::test_integer_type", TEST_YAML_PATH
                     ),
                 }
+            ],
+        }
+    ],
+    "id_": str(TEST_DATA_PATH),
+}
 
 TEST_MULTI_CLASS_NEST_PATH = TEST_DATA_PATH / "test_multi_class_nest.py"