解决冲突

src/view/memberGroup/edit-tag.vue

 <template>
   <div>
     <!-- 添加标签、编辑标签 -->
-<<<<<<< HEAD
     <el-dialog :title="title" :visible.sync="showEditTagPop" width="1000px" top="10vh" :before-close="handleClose" custom-class="edit-tag" :close-on-click-modal="false" append-to-body>
-=======
-    <el-dialog :title="title" :visible.sync="showEditTagPop" width="700px" :before-close="handleClose" :close-on-click-modal="false" append-to-body>
->>>>>>> origin/dev
       <div class="dialog-box">
         <div class="tag-info">
           <p class="tag-name">