From dd5ba96027980a1e221b572fee656130a412691f Mon Sep 17 00:00:00 2001 From: Frode Gundersen Date: Wed, 13 Dec 2023 10:12:56 -0700 Subject: [PATCH] resolve conflicts --- tests/pytests/unit/modules/test_reg.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/tests/pytests/unit/modules/test_reg.py b/tests/pytests/unit/modules/test_reg.py index 51ef0a15a3da..8cecaea530b0 100644 --- 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) \ No newline at end of file + reg.delete_key_recursive(hive="HKLM", key=fake_key) +