removed issues caused by git merging or whatever

2019-04-21 14:01:38 -04:00
parent b14039db53
commit b7ba5a250f
1 changed files with 0 additions and 3 deletions
--- a/style.css
+++ b/style.css
@@ -40,12 +40,9 @@ textarea{
  font-size: 0.9em;
  color: inherit;
 }
-<<<<<<< HEAD
 #decCont{
  font-family: monospace;
 }
-=======
->>>>>>> adb3bd3ecf2ebfd3e1a158cb62184045edb7bb7e
 button{
  display: block;
  margin-left: auto;