Browse Source

Merge branch 'master' of http://git.liuniu946.com/hwq/mnsx

hwq 2 years ago
parent
commit
6d6f066792
1 changed files with 0 additions and 1 deletions
  1. 0 1
      pages/money/wallet.vue

+ 0 - 1
pages/money/wallet.vue

@@ -1,4 +1,3 @@
-<<<<<<< HEAD
 <template>
 	<view class="content">
 		<view class="top-bg">