Git-Mirrors/portapack-mayhem
1
0
Fork 0
mirror of https://github.com/eried/portapack-mayhem.git synced 2025-11-29 16:06:57 -05:00
Code Issues Projects Releases Packages Wiki Activity

Revert "resolve conflicts merge" (#2860)

Browse source 
This reverts commit 344aa0c741.
This commit is contained in:
jLynx 2025-11-08 10:21:33 +13:00 • committed by GitHub
parent a4d23768c1
commit c46cc431c9
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
5 changed files with 2 additions and 26 deletions
Download patch file Download diff file Expand all files Collapse all files

4
firmware/common/ui_widget.hpp
View file

@ -994,10 +994,6 @@ class Waveform : public Widget {
void set_paused(bool paused);
bool is_clickable() const;
bool is_paused() const;
void set_paused(bool paused);
bool is_clickable() const;
void paint(Painter& painter) override;
bool on_key(const KeyEvent key) override;
bool on_touch(const TouchEvent event) override;