From 90a4f2fbb841a934292778ae0ea0fe668ba7013f Mon Sep 17 00:00:00 2001
From: Dooho Yi <pilotedeguerre@gmail.com>
Date: Sun, 31 Jan 2021 20:32:07 +0900
Subject: [PATCH] .

---
 styles/yoshi.css | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/styles/yoshi.css b/styles/yoshi.css
index 0eebb12..40fb376 100644
--- a/styles/yoshi.css
+++ b/styles/yoshi.css
@@ -165,10 +165,6 @@ a:hover {
   display: block;
   font-weight: 700;
   border: unset;
-<<<<<<< HEAD
-  /* color: rgba(180, 64, 134, 0.5); */
-=======
->>>>>>> d5de3bd80a2e71d61cf38a6399bd7b6e57719618
   color: rgba(37, 176, 118, 0.25);
 }