From 2635d82c955ffdbf1c9778ce02e3ffc82a266886 Mon Sep 17 00:00:00 2001
From: Matt Strapp <strap012@umn.edu>
Date: Mon, 26 Apr 2021 15:00:48 -0500
Subject: Revert "change base???"

This reverts commit 6b9335b670df03d3452a9f65f03e1884d60ac88b.
---
 python/start.sh | 7 -------
 1 file changed, 7 deletions(-)

(limited to 'python/start.sh')

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
-- 
cgit v1.2.3