getting ready to pull

This commit is contained in:
ferricles 2021-01-06 16:12:34 -08:00
parent 35ee0c8def
commit 1097f571ca

View file

@ -143,7 +143,6 @@
<input type="text" id="agi-skp" name="agi-skp" />
</div>
</div>
<<<<<<< HEAD
<div class = "build">
<div class = "center" id = "build-helmet" style = "grid-column:1;grid-row:1">
</div>
@ -166,8 +165,6 @@
<div class = "center" id = "build-cumulative-stats" style = "grid-column:2;grid-row:3">
</div>
</div>
=======
>>>>>>> 87b6212eab1673b1a66ca9849232963f2e57363f
<script type="text/javascript" src="build.js">
</script>
<script type="text/javascript" src="test.js">