From 8c0ae8e4d02d71406266b4c7236d13997c616eb7 Mon Sep 17 00:00:00 2001 From: "James E. Petts" Date: Sun, 2 Jun 2024 23:24:29 +0100 Subject: [PATCH] FIX: Incorrect merge conflict resolution --- gui/schedule_gui.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gui/schedule_gui.h b/gui/schedule_gui.h index a33953b37c1..a3839d5b5b6 100644 --- a/gui/schedule_gui.h +++ b/gui/schedule_gui.h @@ -119,7 +119,7 @@ class entry_index_scrollitem_t : public gui_scrolled_list_t::const_text_scrollit public: uint16 unique_entry_id; - entry_index_scrollitem_t(uint8 entry_index, schedule_entry_t entry) : gui_scrolled_list_t::const_text_scrollitem_t(NULL, color_idx_to_rgb(SYSCOL_TEXT)) { + entry_index_scrollitem_t(uint8 entry_index, schedule_entry_t entry) : gui_scrolled_list_t::const_text_scrollitem_t(NULL, SYSCOL_TEXT) { index=entry_index; unique_entry_id = entry.unique_entry_id; }