fix: left git diff

Project-LemonLime · May 28, 2021 · 64d446b · 64d446b
1 parent 0e98de1
commit 64d446b
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 14 deletions.
diff --git a/makespec/BUILDVERSION b/makespec/BUILDVERSION
@@ -1 +1 @@
-139
+140
diff --git a/src/base/LemonConfig.cpp b/src/base/LemonConfig.cpp
@@ -12,7 +12,6 @@
 
 namespace Lemon::base::config {
 
-<<<<<<< HEAD
 	int LemonConfigJudge::read(const QJsonObject &json) {
 		READ_JSON(json, defaultFullScore);
 		READ_JSON(json, defaultTimeLimit);
@@ -21,18 +20,6 @@ namespace Lemon::base::config {
 		READ_JSON(json, specialJudgeTimeLimit);
 		READ_JSON(json, fileSizeLimit);
 		READ_JSON(json, rejudgeTimes);
-=======
-	void LemonConfigJudge::read(const QJsonObject &json) {
-		READ_JSON_INT(defaultFullScore)
-		READ_JSON_INT(defaultTimeLimit)
-		READ_JSON_INT(defaultMemoryLimit)
-		READ_JSON_INT(compileTimeLimit)
-		READ_JSON_INT(specialJudgeTimeLimit)
-		READ_JSON_INT(fileSizeLimit)
-		READ_JSON_INT(rejudgeTimes)
-
-		READ_JSON_DOUBLE(defaultExtraTimeRatio)
->>>>>>> 4862b98 (fix(config): add lost defaultExtraTimeRatio)
 
 		READ_JSON(json, defaultInputFileExtension);
 		READ_JSON(json, defaultOutputFileExtension);