Merge branch 'main' of https://gitea.home.meszely.eu/wpanda/WPanda

2026-01-21 08:45:51 +01:00
parent cfe5a04493 8daa5c88b8
commit d6b5dc9d84
2 changed files with 6 additions and 1 deletions
--- a/Conf/home.meszely.eu/matrix.home.meszely.eu.md
+++ b/Conf/home.meszely.eu/matrix.home.meszely.eu.md
@@ -1,2 +1,7 @@
+<<<<<<< HEAD
 # Matrix - n8n-bot - Accesstoken
 syt_Ym90LW44bg_RMzxOFQllPjSPsRWAHvb_0FeoGL
+=======
+# bot-n8n access token
+syt_Ym90LW44bg_AbviDZpPwRhLydqppDvv_2OfdD8
+>>>>>>> 2e10f37 (token)
--- a/Doc/Default-01.md
+++ b/Doc/Default-01.md
@@ -8,7 +8,7 @@ ep..Ep

 Server:
 t1.meszely
-vi..Vi
+warP#....#Maci

 000
 pandA#...#min