resolve conflicts

frogunder · Dec 13, 2023 · dd5ba96 · dd5ba96
1 parent e5de227
commit dd5ba96
Showing 1 changed file with 2 additions and 1 deletion.
diff --git a/tests/pytests/unit/modules/test_reg.py b/tests/pytests/unit/modules/test_reg.py
@@ -867,4 +867,5 @@ def test_delete_key_recursive_unicode(unicode_key, fake_key):
             == expected
         )
     finally:
-        reg.delete_key_recursive(hive="HKLM", key=fake_key)
+        reg.delete_key_recursive(hive="HKLM", key=fake_key)
+