Trying to fix github's issues

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