merge conflict ridicule

1 files changed, 4 insertions, 3 deletions

diff --git a/style.css b/style.css
index cd8c387..f11199e 100644
--- a/style.css
+++ b/style.css
@@ -116,7 +116,7 @@ table {
 
 td {
     border: thin solid;
-    padding: 0.3em
+    padding: 0.3em;
 }
 
 tr:nth-child(even) {
@@ -212,7 +212,7 @@ tr:nth-child(even) {
     border-radius: .75em;
     width: 220px;
     height: 80px;
-    background-color: #FFB042
+    background-color: #FFC0C0
 }
 
 #S1 {
@@ -228,9 +228,10 @@ tr:nth-child(even) {
     border-radius: .75em;
     width: 220px;
     height: 80px;
-    background-color: #ADFF09
+    background-color: #FF58F7
 }
 
+
 .readable {
     margin-left: auto;
     margin-right: auto;