From c9efe4f4cd0212bc16a347e84f8320e67666c211 Mon Sep 17 00:00:00 2001
From: lihuilin <analsak@163.com>
Date: Sun, 29 Jun 2025 12:00:22 +0800
Subject: [PATCH] ??

---
 src/views/managerecharge/rate.vue | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/src/views/managerecharge/rate.vue b/src/views/managerecharge/rate.vue
index 3788d08..5aa0977 100644
--- a/src/views/managerecharge/rate.vue
+++ b/src/views/managerecharge/rate.vue
@@ -157,9 +157,6 @@ import request from '@/util/http'
 .unit {
   margin-left: 10px;
 }
-<<<<<<< HEAD
-</style>
-=======
 
 .el-card {
   padding: 0px;
@@ -177,4 +174,3 @@ import request from '@/util/http'
   hyphens: auto;
 }
 </style>
->>>>>>> milestone-20250623-金币前端