fix: pytest

2025-03-19 12:56:07 +08:00 · 2025-03-19 12:56:07 +08:00 · a4717268ec
commit a4717268ec
parent 45903ae308
1 changed files with 1 additions and 6 deletions
--- 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
                            }
                        ]
                    }