revert merge_into_sc_element_type:merging_into_none testcase

Jasha10 · Jasha10 · commit 007a879cca59 · 2021-06-12T19:13:56.000-05:00
diff --git a/tests/test_merge.py b/tests/test_merge.py
@@ -280,7 +280,7 @@
                 DictConfig({"user007": "???"}, element_type=User),
                 {"user007": {"age": 99}},
             ),
-            {"user007": {"name": "???", "age": 99}},
+            {"user007": {"name": None, "age": 99}},
             id="dict:merge_into_sc_element_type:merging_into_none",
         ),
         # missing DictConfig
