aboutsummaryrefslogtreecommitdiffstats
path: root/python/dotsandboxes
diff options
context:
space:
mode:
authorMatt Strapp <strap012@umn.edu>2021-04-26 10:53:43 -0500
committerMatt Strapp <strap012@umn.edu>2021-04-26 15:03:24 -0500
commit7535ef51e84067e27f1a4c53f8889047f3a9a098 (patch)
treee5f1f9da55fb2ba2b2c482a608a328f68ddbd012 /python/dotsandboxes
parentTest commit (diff)
downloadcsci4511w-7535ef51e84067e27f1a4c53f8889047f3a9a098.tar
csci4511w-7535ef51e84067e27f1a4c53f8889047f3a9a098.tar.gz
csci4511w-7535ef51e84067e27f1a4c53f8889047f3a9a098.tar.bz2
csci4511w-7535ef51e84067e27f1a4c53f8889047f3a9a098.tar.lz
csci4511w-7535ef51e84067e27f1a4c53f8889047f3a9a098.tar.xz
csci4511w-7535ef51e84067e27f1a4c53f8889047f3a9a098.tar.zst
csci4511w-7535ef51e84067e27f1a4c53f8889047f3a9a098.zip
change base???
Diffstat (limited to 'python/dotsandboxes')
-rw-r--r--python/dotsandboxes/dotsandboxesagent.py5
-rw-r--r--python/dotsandboxes/static/dotsandboxes.html12
2 files changed, 17 insertions, 0 deletions
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 @@
<html>
<html lang="en">
<meta charset="utf-8">
+<<<<<<< HEAD
+=======
+<meta name="author" content="Wannes Meert">
+<meta name="description" content="Dots-and-Boxes game. Part of the Machine Learning: Project course at KU Leuven (Hendrik Blockeel, Wannes Meert).">
+<meta name="keywords" content="artificial intelligence,AI,machine learning,dots and boxes,KU Leuven">
+>>>>>>> f6e623d... change base???
<meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">
<title>Dots and Boxes</title>
<link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/bootstrap/4.0.0/css/bootstrap.min.css" integrity="sha384-Gn5384xqQ1aoWXA+058RXPxPg6fy4IWvTNh0E263XmFcJlSAwiGgFAW/dAiS6JXm" crossorigin="anonymous">
@@ -42,6 +48,12 @@
</div>
</div>
</div>
+<<<<<<< HEAD
+=======
+ <div class="footer">
+ <small>&copy; <a href="https://dtai.cs.kuleuven.be">DTAI Research Group</a>, KU Leuven &mdash; <a href="https://github.com/wannesm/dotsandboxes">Source</a></small>
+ </div>
+>>>>>>> f6e623d... change base???
</div>
<script src="https://d3js.org/d3.v4.min.js"></script>
<script src="dotsandboxes.js"></script>