endernon/wynnbuilder-forked-for-changes
1
0
Fork 0
forked from morphNon/wynnbuilder-idk
Code Pull requests Activity

getting ready to pull

Browse source
This commit is contained in:
ferricles 2021-01-06 16:12:34 -08:00
parent 35ee0c8def
commit 1097f571ca
1 changed files with 0 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
index.html
View file

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