aboutsummaryrefslogtreecommitdiffstats
path: root/python/start.sh
diff options
context:
space:
mode:
Diffstat (limited to '')
-rwxr-xr-xpython/start.sh7
1 files changed, 7 insertions, 0 deletions
diff --git a/python/start.sh b/python/start.sh
index 455944d..26a4b70 100755
--- a/python/start.sh
+++ b/python/start.sh
@@ -1,3 +1,4 @@
+<<<<<<< HEAD
#/bin/bash
(cd dotsandboxes; python3 dotsandboxesserver.py 8080) &
python3 agent.py 10001 &
@@ -5,6 +6,12 @@ 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