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/dotsandboxes/dotsandboxesagent.py | 5 -----
 1 file changed, 5 deletions(-)

(limited to 'python/dotsandboxes/dotsandboxesagent.py')

diff --git a/python/dotsandboxes/dotsandboxesagent.py b/python/dotsandboxes/dotsandboxesagent.py
index e7407bf..9fe6cb8 100644
--- a/python/dotsandboxes/dotsandboxesagent.py
+++ b/python/dotsandboxes/dotsandboxesagent.py
@@ -15,11 +15,6 @@ import asyncio
 import websockets
 import json
 from collections import defaultdict
-<<<<<<< HEAD
-=======
-import random
-
->>>>>>> f6e623d... change base???
 
 logger = logging.getLogger(__name__)
 games = {}
-- 
cgit v1.2.3