From 5bcb7b08669d3b5fb0ee0fd3668acd11f6aecbb8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=B5=B5=E4=BC=9F=E5=BA=9A?= <zhaoweigeng@wodcloud.com>
Date: Tue, 21 Mar 2023 11:56:20 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=86=B2=E7=AA=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/assets/css/index.css | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/src/assets/css/index.css b/src/assets/css/index.css
index def943d..f78af13 100644
--- a/src/assets/css/index.css
+++ b/src/assets/css/index.css
@@ -1559,7 +1559,6 @@ border-radius:8px;
   color: #d75138;
 }
 
-<<<<<<< HEAD
 .register_btn {
   background-color: #eff2fa;
   border-radius: 4px;
@@ -1578,7 +1577,6 @@ border-radius:8px;
   padding: 20px;
 }
 
-=======
 .tip-image {
   position: absolute;
   right: -24px;
@@ -1589,4 +1587,3 @@ border-radius:8px;
   background-image: url("../imgs/ic_tips.png");
   background-size: contain;
 }
->>>>>>> a152210490b057d5d9be08d415be67274b954aaf
-- 
2.26.0