update

Toshihiro Shimizu · Toshihiro Shimizu · commit a606f5fc78f5 · 2023-02-18T21:23:05.000+09:00
diff --git a/atcodertools/atcoder_tools.py b/atcodertools/atcoder_tools.py
@@ -46,22 +46,8 @@ def main():
         print(
             "{} compile -- to compile codes in your workspace".format(sys.argv[0]))
         print("{} test -- to test codes in your workspace".format(sys.argv[0]))
-        print(
-            "{} compile -- to compile codes in your workspace".format(sys.argv[0]))
-        print("{} test -- to test codes in your workspace".format(sys.argv[0]))
->>>>>>> test_fmtprediction
-        print(
-            "{} test -- to test your code in the workspace".format(sys.argv[0]))
         print(
             "{} submit -- to submit your code to the contest system".format(sys.argv[0]))
-        print(
-            "{} compile -- compile source code".format(sys.argv[0]))
-        print(
-            "{} set -- switch program language/judge method".format(sys.argv[0]))
-        print(
-            "{} codegen -- to generate code of the specified single problem".format(sys.argv[0]))
-        print(
-            "{} set -- to set some additional option(error value, language)".format(sys.argv[0]))
         print(
             "{} set -- to set some additional option(error value, language)".format(sys.argv[0]))
         print(
diff --git a/atcodertools/config/etc_config.py b/atcodertools/config/etc_config.py
@@ -14,5 +14,3 @@ def __init__(self,
         self.skip_existing_problems = skip_existing_problems
         self.in_example_format = in_example_format
         self.out_example_format = out_example_format
-        self.compile_before_testing = compile_before_testing
-        self.compile_only_when_diff_detected = compile_only_when_diff_detected
diff --git a/atcodertools/tools/models/metadata.py b/atcodertools/tools/models/metadata.py
@@ -2,29 +2,11 @@
 from typing import Optional
 
 from atcodertools.client.models.problem import Problem
-<<<<<<< HEAD
-from atcodertools.common.judgetype import NormalJudge, DecimalJudge, MultiSolutionJudge, InteractiveJudge, Judge, \
-    NoJudgeTypeException
-from atcodertools.common.language import Language, CPP
-
-DEFAULT_IN_EXAMPLE_PATTERN = 'in_*.txt'
-DEFAULT_OUT_EXAMPLE_PATTERN = "out_*.txt"
-=======
 from atcodertools.common.judgetype import NormalJudge, DecimalJudge, Judge
 from atcodertools.common.language import Language, CPP
 
 
 class Metadata:
-
-<<<<<<< HEAD
-    def __init__(self,
-                 problem: Optional[Problem],
-                 code_filename: Optional[str],
-                 sample_in_pattern: str,
-                 sample_out_pattern: str,
-                 lang: Optional[Language],
-                 judge_method: Judge = NormalJudge()):
-=======
     def __init__(self, problem: Problem, code_filename: str, sample_in_pattern: str, sample_out_pattern: str,
                  lang: Language, judge_method: Judge = NormalJudge(), timeout_ms: int = None):
         self.problem = problem
