merge changes

2026-09-25 15:12:25 -05:00
parent 8d661d2b31
commit 2d4db7ef4b
2 changed files with 0 additions and 99 deletions
@@ -46,9 +46,6 @@ TextField {
 	}
    Connections {
        target: OverlayController
-<<<<<<< HEAD
-        function onKeyBoardInputSignal() {
-=======

        onSubmitLastTextField:{
            //value here is UID
@@ -64,7 +61,6 @@ TextField {
        }

        onKeyBoardInputSignal: {
->>>>>>> origin/master
            if (userValue == keyBoardUID) {
                if(input == '\b'){
                    myTextField.text = text.slice(0,-1)