From 26de811174a210c9ee8a5650c72552d09d19f70f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?WEB=E8=AE=B8=E4=BD=95=E5=93=B2=5Cxuhez?=
 <xuhezhe@jikimo.com>
Date: Fri, 20 Oct 2023 16:33:00 +0800
Subject: [PATCH] =?UTF-8?q?=E7=9C=8B=E6=9D=BF=E6=A0=B7=E5=BC=8F=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 jikimo_frontend/static/src/scss/custom_style.scss | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/jikimo_frontend/static/src/scss/custom_style.scss b/jikimo_frontend/static/src/scss/custom_style.scss
index 2ce81826..3d8f0751 100644
--- a/jikimo_frontend/static/src/scss/custom_style.scss
+++ b/jikimo_frontend/static/src/scss/custom_style.scss
@@ -290,8 +290,6 @@ div[class="o_content o_component_with_search_panel"] .o_kanban_primary_right > .
 .text-bg-warning {
   background-color: #FED300 !important;
 }
-<<<<<<< HEAD
-=======
 
 .test_model>div {
   display: flex;
@@ -337,4 +335,3 @@ div:has(.o_required_modifier) > label::before {
   overflow: visible;
 }
 
->>>>>>> develop