resolve conflict

Tiketeer · May 1, 2024 · b4b71f9 · b4b71f9
1 parent c367048
commit b4b71f9
Showing 1 changed file with 0 additions and 8 deletions.
diff --git a/stress-test/test-result-combiner.py b/stress-test/test-result-combiner.py
@@ -94,14 +94,6 @@ def writeResultFile(p: Path, durationResult: dict, failResult: dict):
     p = Path(path)
 
     result, failResult = makeResult(p)
-<<<<<<< HEAD
-
-    path = '/'.join(['./result', 'result_' + sys.argv[1] + '.csv'])
-    p = Path(path)
-    writeResultFile(p, result, failResult)
-=======
-
     path = '/'.join(['./result', 'result_' + sys.argv[1] + '.csv'])
     p = Path(path)
     writeResultFile(p, result, failResult)
->>>>>>> develop