From b4b71f97c6b9440273ba23bcca48dba6c8a916ed Mon Sep 17 00:00:00 2001
From: claycat <catenarywkd@naver.com>
Date: Wed, 1 May 2024 14:25:29 +0900
Subject: [PATCH] resolve conflict

---
 stress-test/test-result-combiner.py | 8 --------
 1 file changed, 8 deletions(-)

diff --git a/stress-test/test-result-combiner.py b/stress-test/test-result-combiner.py
index 30e0698..ef6445c 100644
--- 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