#

src/views/fundManage/makerfundApply.vue

@@ -422,10 +422,6 @@
 <script>
     import BeUpload from "../../components/tool/beUpload.vue";
     import getExcel from "@/components/tool/getExcel";
-<<<<<<< HEAD
-=======
-
->>>>>>> 7a1d3a286a28d4688126313b674db18dd9691a99
 export default {
 
     components: {