FIX: Incorrect merge conflict resolution

TransshipmentEnvoy · Jun 2, 2024 · 8c0ae8e · 8c0ae8e
1 parent b95368b
commit 8c0ae8e
Showing 1 changed file with 1 addition and 1 deletion.
diff --git 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;
 	}