From dfcd95ba8a298885e899299ec47821a71dc2658a Mon Sep 17 00:00:00 2001
From: kur0nek-o <maulana21mh@gmail.com>
Date: Fri, 27 Oct 2023 11:08:47 +0700
Subject: [PATCH] fix conflict

---
 src/assets/css/style.css | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/src/assets/css/style.css b/src/assets/css/style.css
index 06951df..c62282c 100644
--- a/src/assets/css/style.css
+++ b/src/assets/css/style.css
@@ -1889,13 +1889,8 @@ select {
   --tw-bg-opacity: 0.8;
 }
 
-<<<<<<< HEAD
-.bg-none {
-  background-image: none;
-=======
 .bg-opacity-100 {
   --tw-bg-opacity: 1;
->>>>>>> 28382959d66e99e037740e0f946d7fa2ff14e3f5
 }
 
 .fill-gray-500 {