diff --git a/pages/my/historyMy.vue b/pages/my/historyMy.vue
index a1df4ff..0001078 100644
--- a/pages/my/historyMy.vue
+++ b/pages/my/historyMy.vue
@@ -39,11 +39,7 @@
 							<view class="item-view-bottom-qian">
 								<span>￥</span>
 								<span>{{item.price}}</span>
-<<<<<<< .mine
 								<span>/套</span>
-=======
-
->>>>>>> .theirs
 								<span>￥</span>
 								<span>{{item.oldPrice}}</span>
 							</view>