From b7ba5a250fd928d4428ff3a9fbb0dfd675c6001d Mon Sep 17 00:00:00 2001
From: "OakBaron (queso)" <21106956+OakBaron@users.noreply.github.com>
Date: Sun, 21 Apr 2019 14:01:38 -0400
Subject: [PATCH] removed issues caused by git merging or whatever

---
 style.css | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/style.css b/style.css
index 10903aa..84159d3 100644
--- 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;