diff --git a/vue/gold-system/src/views/recharge/addRecharge.vue b/vue/gold-system/src/views/recharge/addRecharge.vue
index f3d2011..1d0aa58 100644
--- a/vue/gold-system/src/views/recharge/addRecharge.vue
+++ b/vue/gold-system/src/views/recharge/addRecharge.vue
@@ -7,7 +7,6 @@ import { Plus } from '@element-plus/icons-vue'
 </script>
 
 <template>
-<<<<<<< HEAD
   <div>
     新增充值
   </div>
@@ -84,9 +83,6 @@ import { Plus } from '@element-plus/icons-vue'
 <div>
   
 </div>
-=======
-    <h1>Add Recharge</h1>
->>>>>>> 1779301c1263a097fb8b7b909a618d3670373ff6
 </template>
 
 <style scoped>