fix(config): add lost defaultExtraTimeRatio

#92 (comment)

Author: CoelacanthusHex

src/base/LemonConfig.cpp

@@ -12,6 +12,7 @@
 
 namespace Lemon::base::config {
 
+<<<<<<< HEAD
 	int LemonConfigJudge::read(const QJsonObject &json) {
 		READ_JSON(json, defaultFullScore);
 		READ_JSON(json, defaultTimeLimit);
@@ -20,6 +21,18 @@ 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);

src/base/LemonConfig.hpp

@@ -26,6 +26,7 @@ namespace Lemon::base::config {
 		int specialJudgeTimeLimit{};
 		int fileSizeLimit{};
 		int rejudgeTimes{};
+        double defaultExtraTimeRatio{};
 		QString defaultInputFileExtension;
 		QString defaultOutputFileExtension;
 		QStringList inputFileExtensions;