From 7535ef51e84067e27f1a4c53f8889047f3a9a098 Mon Sep 17 00:00:00 2001 From: Matt Strapp Date: Mon, 26 Apr 2021 10:53:43 -0500 Subject: change base??? --- python/dotsandboxes/dotsandboxesagent.py | 5 +++++ python/dotsandboxes/static/dotsandboxes.html | 12 ++++++++++++ 2 files changed, 17 insertions(+) (limited to 'python/dotsandboxes') diff --git a/python/dotsandboxes/dotsandboxesagent.py b/python/dotsandboxes/dotsandboxesagent.py index 9fe6cb8..e7407bf 100644 --- a/python/dotsandboxes/dotsandboxesagent.py +++ b/python/dotsandboxes/dotsandboxesagent.py @@ -15,6 +15,11 @@ import asyncio import websockets import json from collections import defaultdict +<<<<<<< HEAD +======= +import random + +>>>>>>> f6e623d... change base??? logger = logging.getLogger(__name__) games = {} diff --git a/python/dotsandboxes/static/dotsandboxes.html b/python/dotsandboxes/static/dotsandboxes.html index 4e97508..d250c76 100644 --- a/python/dotsandboxes/static/dotsandboxes.html +++ b/python/dotsandboxes/static/dotsandboxes.html @@ -2,6 +2,12 @@ +<<<<<<< HEAD +======= + + + +>>>>>>> f6e623d... change base??? Dots and Boxes @@ -42,6 +48,12 @@ +<<<<<<< HEAD +======= + +>>>>>>> f6e623d... change base??? -- cgit v1.2.3