logburn/CS-Create
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

removed issues caused by git merging or whatever

Browse Source
This commit is contained in:
OakBaron (queso)
2019-04-21 14:01:38 -04:00
parent b14039db53
commit b7ba5a250f
1 changed files with 0 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
style.css
View File

@@ -40,12 +40,9 @@ textarea{
font-size: 0.9em; font-size: 0.9em;
color: inherit; color: inherit;
} }
<<<<<<< HEAD
#decCont{ #decCont{
font-family: monospace; font-family: monospace;
} }
=======
>>>>>>> adb3bd3ecf2ebfd3e1a158cb62184045edb7bb7e
button{ button{
display: block; display: block;
margin-left: auto; margin-left: auto;