Hatchery support
3 unresolved threads
3 unresolved threads
Compare changes
Files
3
Conflict: This file was modified in both the source and target branches.
Ask someone with write access to resolve it.
+ 35
− 12
@@ -9,21 +9,43 @@ import buttons
@@ -56,7 +78,7 @@ def draw_menu(disp, applist, idx, offset):
@@ -66,6 +88,7 @@ def draw_menu(disp, applist, idx, offset):
@@ -103,7 +126,7 @@ def main():