修改冲突

5bcb7b08 · 赵伟庚 · d5d1480b · 5bcb7b08
Commit 5bcb7b08 authored Mar 21, 2023 by 赵伟庚
Show whitespace changes
Inline Side-by-side

Showing with 0 additions and 3 deletions

src/assets/css/index.css src/assets/css/index.css +0 -3

No files found.
--- 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