.

DMOJ · Dec 31, 2023 · 99368d0 · 99368d0
1 parent 0c87910
commit 99368d0
Showing 1 changed file with 0 additions and 13 deletions.
diff --git a/dmoj/graders/base.py b/dmoj/graders/base.py
@@ -37,21 +37,8 @@ def grade(self, case: TestCase) -> Result:
     def _generate_binary(self) -> BaseExecutor:
         raise NotImplementedError
 
-<<<<<<< HEAD
-    def abort_grading(self) -> None:
-        self._abort_requested = True
-        if self._current_proc:
-            try:
-                self._current_proc.kill()
-            except OSError:
-                pass
-
     def _resolve_testcases(self, cfg, batch_no=0) -> List[BaseTestCase]:
         cases: List[BaseTestCase] = []
-=======
-    def _resolve_testcases(self, cfg, batch_no=0):
-        cases = []
->>>>>>> 662a3127 (judge: implement instant aborts)
         for case_config in cfg:
             if 'batched' in case_config.raw_config:
                 self._batch_counter += 1