Update tests/git_merge.py

Co-authored-by: Atarust <jonas.kapitzke@gmail.com>
carlini · Feb 24, 2024 · e87ba13 · e87ba13
1 parent ba22b7c
commit e87ba13
Showing 1 changed file with 0 additions and 2 deletions.
diff --git a/tests/git_merge.py b/tests/git_merge.py
@@ -42,8 +42,6 @@ def test_merge_conflict_resolved():
     except:
         return False
 
-    return success
-
 
 def setup_merge():
     import os