解决冲突

src/components/collectionTable.vue

@@ -21,7 +21,7 @@
             <el-button size="mini" style="width: 74px;height: 20px;margin-right: 7px;" @click="getTable" v-if="isSelectTable">获取表格信息</el-button>
         </div>
         <!-- 全部表格信息 -->
-        <div style="overflow: auto;height: 230px;" :style="{ width: widthResize + 'px' }">git
+        <div style="overflow: auto;height: 230px;" :style="{ width: widthResize + 'px' }">
             <vxe-table :data="selectTableData" ref="xTableColumn" border class="mytable-scrollbar" height="220"
                 v-if="isSelectTable" auto-resize style="margin-bottom: 5px;" @current-change="currentChangeEvent"
                 highlight-hover-row highlight-current-row>