Added load file button

2023-08-07 17:45:21 +02:00 · 2023-08-07 17:45:21 +02:00 · a53d273c99
parent d45ca80060
commit a53d273c99
1 changed files with 0 additions and 4 deletions
--- a/software.py
+++ b/software.py
@ -11,7 +11,6 @@ import os

 playback2 = False
 record2 = False
-<<<<<<< HEAD
 recordSet = False
 keyboardControl = keyboard.Controller()

@ -181,9 +180,6 @@ def buttonDisabledToEnable():
    playback2 = False


->>>>>>> 7043313f60759a798761a735a23a23dd99d0135b
-
-
 def saveMacro():
    keyboardControl.press(keyboard.Key.ctrl_l)
    keyboardControl.press('s')