add test_runner.average_run_time to config.json dataclass

2021-05-12 11:47:22 -04:00
parent 9f32686128
commit 3f93453fb1
1 changed files with 0 additions and 4 deletions
--- a/bin/data.py
+++ b/bin/data.py
@@ -50,10 +50,6 @@ class EditorSettings:
    indent_size: int = 4
    ace_editor_language: str = "python"
    highlightjs_language: str = "python"
-<<<<<<< HEAD
-
-=======
->>>>>>> Gracefully fail with user-friendly error text when unrecognized dataclass fields are detected

    def __post_init__(self):
        if isinstance(self.indent_style, str):