Repo reorg

2023-12-07 08:12:38 +01:00
parent 65408e3a44
commit ae6ad884f7
19 changed files with 9 additions and 159 deletions
--- a/advanced/hmi/nspanel_eu_code/buttonpage02.txt
+++ b/advanced/hmi/nspanel_eu_code/buttonpage02.txt
@@ -17,16 +17,7 @@ Page buttonpage02
                page home
            }else
            {
-<<<<<<<< HEAD:advanced/hmi/nspanel_us_land_code/buttonpage02.txt
-                printh 92
-                prints "currentpage",0
-                printh 00
-                prints "buttonpage02",0
-                printh 00
-                printh FF FF FF
-========
                sendme
->>>>>>>> 0565f5f522cb55b813ff949b082a11b1f2bd35dd:advanced/hmi/nspanel_eu_code/buttonpage02.txt
                vis 255,0
                vis button_back,1
                vis page_index,1