diff options
| author | Matt Strapp <strap012@umn.edu> | 2021-04-26 15:00:48 -0500 |
|---|---|---|
| committer | Matt Strapp <strap012@umn.edu> | 2021-04-26 15:03:24 -0500 |
| commit | 2635d82c955ffdbf1c9778ce02e3ffc82a266886 (patch) | |
| tree | 438c299b8b869df29e43e7c0ce3ee917e5ad0f98 /python/start.sh | |
| parent | change base??? (diff) | |
| download | csci4511w-2635d82c955ffdbf1c9778ce02e3ffc82a266886.tar csci4511w-2635d82c955ffdbf1c9778ce02e3ffc82a266886.tar.gz csci4511w-2635d82c955ffdbf1c9778ce02e3ffc82a266886.tar.bz2 csci4511w-2635d82c955ffdbf1c9778ce02e3ffc82a266886.tar.lz csci4511w-2635d82c955ffdbf1c9778ce02e3ffc82a266886.tar.xz csci4511w-2635d82c955ffdbf1c9778ce02e3ffc82a266886.tar.zst csci4511w-2635d82c955ffdbf1c9778ce02e3ffc82a266886.zip | |
Revert "change base???"
This reverts commit 6b9335b670df03d3452a9f65f03e1884d60ac88b.
Diffstat (limited to 'python/start.sh')
| -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 |