fixed merge conflicts

This commit is contained in:
Jakob Meier
2021-10-08 11:40:46 +02:00
38 changed files with 700 additions and 71 deletions

View File

@ -7,6 +7,6 @@ echo "-L 1536:192.168.133.10:7301 for TMTC commanding"
ssh -L 1534:192.168.133.10:1534 \
-L 1535:192.168.133.10:22 \
-L 1536:192.168.133.10:7301 \
-L 1537:192.168.133.10:7100 \
-L 1537:127.0.0.1:7100 \
eive@2001:7c0:2018:1099:babe:0:e1fe:f1a5 \
-t 'CONSOLE_PREFIX="[Q7S Tunnel]" /bin/bash'