bugfix

src/views/resource/videoManagement/festival/edit/index.vue

@@ -357,12 +357,8 @@
           <el-button
             type="primary"
             @click="submit('listData')"
-<<<<<<< HEAD
-            :disabled="!noStudent"
-=======
             :disabled="listData.sectionType === 1 ? !noStudent : false"
             :loading="disabledBtn"
->>>>>>> b2a276f5917ad406fb7c2bd0e52954a213cb9492
             >确定</el-button
           >
         </el-form-item>