From 64d9b689330804ab5c9d2196f042fd93e48611d9 Mon Sep 17 00:00:00 2001 From: Tyler McGavran Date: Tue, 30 Nov 2021 01:02:55 -0500 Subject: [PATCH] Fix bad merge conflict resolution in defines.h (#72) Signed-off-by: Taggerung --- include/defines.h | 1 + 1 file changed, 1 insertion(+) diff --git a/include/defines.h b/include/defines.h index a54434ea7..d8a5e7475 100644 --- a/include/defines.h +++ b/include/defines.h @@ -80,6 +80,7 @@ #define TIME_TRIAL_3LAP_RECORD_5 4 #define TIME_TRIAL_1LAP_RECORD 5 +/** * Text color options * The 2 cycling options cycle through Blue -> Green -> Red * Cycle 2 appears to be one step ahead of Cycle 1