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/static/dotsandboxes.html | 12 ++++++++++++ 1 file changed, 12 insertions(+) (limited to 'python/dotsandboxes/static') 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