From 35c60a415852a3b8e2950f39bf0ce1d8dedc184d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=28=C2=B4=E3=83=BB=CF=89=E3=83=BB=EF=BD=80=29?= Date: Sat, 10 Feb 2024 21:24:44 +0900 Subject: [PATCH] FIX merging conflict --- gui/line_waiting_status.cc | 1 + 1 file changed, 1 insertion(+) diff --git a/gui/line_waiting_status.cc b/gui/line_waiting_status.cc index 32d3a2662ce..c1a63c311f8 100644 --- a/gui/line_waiting_status.cc +++ b/gui/line_waiting_status.cc @@ -32,6 +32,7 @@ void gui_halt_waiting_catg_t::update() new_component("-", COL_INACTIVE); } else if (!update_seed) { + new_component(GOODS_COLOR_BOX_HEIGHT); new_component("0", SYSCOL_TEXT_WEAK); } else {