Skip to content

Commit d79bc35

Browse files
committed
Add txt file to hint tools menu use.
1 parent 82ead0c commit d79bc35

File tree

2 files changed

+0
-7
lines changed

2 files changed

+0
-7
lines changed

src/BF/use_tools_menu_instead_of_this.txt

Whitespace-only changes.

src/SCRIPTS/BF/ui.lua

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -300,14 +300,7 @@ function run_ui(event)
300300
-- process send queue
301301
mspProcessTxQ()
302302
-- navigation
303-
<<<<<<< HEAD
304-
if isTelemetryScript and event == EVT_VIRTUAL_MENU_LONG then -- telemetry script
305-
menuActive = 1
306-
currentState = pageStatus.displayMenu
307-
elseif (not isTelemetryScript) and event == EVT_VIRTUAL_ENTER_LONG then -- standalone
308-
=======
309303
if (event == EVT_VIRTUAL_ENTER_LONG) then
310-
>>>>>>> removed events.lua
311304
menuActive = 1
312305
killEnterBreak = 1
313306
currentState = pageStatus.displayMenu

0 commit comments

Comments
 (0)