Git-Mirrors/portapack-mayhem
1
0
Fork 0
mirror of https://github.com/eried/portapack-mayhem.git synced 2025-11-30 08:26:46 -05:00
Code Issues Projects Releases Packages Wiki Activity

resolve conflicts merge

Browse source
This commit is contained in:
gullradriel 2025-11-07 21:36:41 +01:00 • committed by GitHub
parent fd7637187a
commit 344aa0c741
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
5 changed files with 26 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

2
firmware/application/external/tetris/ui_tetris.hpp vendored
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{