diff options
Diffstat (limited to '')
| -rwxr-xr-x | python/start.sh | 7 |
1 files changed, 0 insertions, 7 deletions
diff --git a/python/start.sh b/python/start.sh index 26a4b70..455944d 100755 --- a/python/start.sh +++ b/python/start.sh @@ -1,4 +1,3 @@ -<<<<<<< HEAD #/bin/bash (cd dotsandboxes; python3 dotsandboxesserver.py 8080) & python3 agent.py 10001 & @@ -6,12 +5,6 @@ python3 agent.py 10002 & echo "Press enter to close all programs" read TRASH; -======= -(cd dotsandboxes; python3 dotsandboxesserver.py 8080) & -python3 agent.py 10001 & -python3 agent.py 10002 & -read -p "Press enter to close all programs." ->>>>>>> f6e623d... change base??? trap "exit" INT TERM trap "kill 0" EXIT |