aboutsummaryrefslogtreecommitdiffstats
path: root/python/dotsandboxes
diff options
context:
space:
mode:
authorMatt Strapp <strap012@umn.edu>2021-04-26 15:00:48 -0500
committerMatt Strapp <strap012@umn.edu>2021-04-26 15:03:24 -0500
commit2635d82c955ffdbf1c9778ce02e3ffc82a266886 (patch)
tree438c299b8b869df29e43e7c0ce3ee917e5ad0f98 /python/dotsandboxes
parentchange base??? (diff)
downloadcsci4511w-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/dotsandboxes')
-rw-r--r--python/dotsandboxes/dotsandboxesagent.py5
-rw-r--r--python/dotsandboxes/static/dotsandboxes.html12
2 files changed, 0 insertions, 17 deletions
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 = {}
diff --git a/python/dotsandboxes/static/dotsandboxes.html b/python/dotsandboxes/static/dotsandboxes.html
index d250c76..4e97508 100644
--- a/python/dotsandboxes/static/dotsandboxes.html
+++ b/python/dotsandboxes/static/dotsandboxes.html
@@ -2,12 +2,6 @@
<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">
@@ -48,12 +42,6 @@
</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>