fix conflict

app.json

@@ -61,4 +61,4 @@
       }
     ]
   }
-}
+}

pages/upload/upload.wxml

@@ -62,7 +62,6 @@
   </view>
   <view bindtap="post" class="post">提交资料</view>
 </view>
-
 <view class="model {{show?'show':''}}" bindtap="hideImg">
   <image src="{{img}}" mode="widthFix"></image>
 </view>