summaryrefslogtreecommitdiff
path: root/index.html
diff options
context:
space:
mode:
Diffstat (limited to 'index.html')
-rw-r--r--index.html13
1 files changed, 13 insertions, 0 deletions
diff --git a/index.html b/index.html
index 1ea90b2..28b1362 100644
--- a/index.html
+++ b/index.html
@@ -10,7 +10,20 @@
<body>
<div class="chess-board">
<div>
+<<<<<<< Updated upstream
<div id="a8" class="1 white"></div>
+=======
+ <div id="a8" class="1 white">R</div>
+ <div id="b8" class="2 black">P</div>
+ <div id="c8" class="3 white"></div>
+ <div id="d8" class="4 black"></div>
+ <div id="e8" class="5 white"></div>
+ <div id="f8" class="6 black"></div>
+ <div id="g8" class="7 white"></div>
+ <div id="h8" class="8 black">R</div>
+ </div>
+ <div>
+>>>>>>> Stashed changes
<div id="a7" class="2 black"></div>
<div id="a6" class="3 white"></div>
<div id="a5" class="4 black"></div>