resolve conflicts merge

This commit is contained in:
gullradriel
2025-11-07 21:36:41 +01:00
committed by GitHub
parent fd7637187a
commit 344aa0c741
5 changed files with 26 additions and 2 deletions
+1 -1
View File
@@ -154,7 +154,7 @@ class TetrisView : public View {
NavigationView& nav_;
Button dummy{
{240, 0, 0, 0},
{screen_width, 0, 0, 0},
""};
MessageHandlerRegistration message_handler_frame_sync{