From a4717268ec48973373d9e6fb767d73d4aa528e9f Mon Sep 17 00:00:00 2001
From: jon-lee <jon-lee@sjtu.edu.cn>
Date: Wed, 19 Mar 2025 12:56:07 +0800
Subject: [PATCH] fix: pytest

---
 tests/convert/diff/task.json | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/tests/convert/diff/task.json b/tests/convert/diff/task.json
index 9312c65..fde2dad 100644
--- a/tests/convert/diff/task.json
+++ b/tests/convert/diff/task.json
@@ -74,9 +74,7 @@
                                 },
                                 "cpuLimit": 2000000000,
                                 "clockLimit": 4000000000,
-<<<<<<< HEAD
-                                "memoryLimit": 4194304,
-                                "procLimit": 50
+                                "memoryLimit": 4194304
                             },
                             {
                                 "stdin": {
@@ -117,9 +115,6 @@
                                 "stdin": {
                                     "src": "/home/tt/.config/joj/diff/task1/subtask1/task5.in"
                                 }
-=======
-                                "memoryLimit": 4194304
->>>>>>> master
                             }
                         ]
                     }