From 2eb2915d54c895c9f668c5ccf46fc1082229a26d Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期五, 18 七月 2025 19:07:01 +0800
Subject: [PATCH] 前端

---
 small-program/unpackage/dist/dev/mp-weixin/pages/set-up/set-up.wxss |    4 ----
 1 files changed, 0 insertions(+), 4 deletions(-)

diff --git a/small-program/unpackage/dist/dev/mp-weixin/pages/set-up/set-up.wxss b/small-program/unpackage/dist/dev/mp-weixin/pages/set-up/set-up.wxss
index 3879d95..fbe672f 100644
--- a/small-program/unpackage/dist/dev/mp-weixin/pages/set-up/set-up.wxss
+++ b/small-program/unpackage/dist/dev/mp-weixin/pages/set-up/set-up.wxss
@@ -122,12 +122,8 @@
   border-radius: 44rpx;
   font-weight: 500;
   font-size: 32rpx;
-<<<<<<< HEAD
-  color: #5BBE38;
-=======
   color: white;
   background-color: #15CF52;
->>>>>>> bbd9c436f23f5fdbe712c4a22d90b457066bdf38
   margin-top: 80rpx;
   border: 1rpx solid #15CF52;
 }

--
Gitblit v1.9.3