修复代码合并BUG。

src/window1/tabGridView/NewTabButton.vue

@@ -159,13 +159,7 @@
     </template>
   </Modal>
 
-  <<<<<<< HEAD
   <component :is="modal1Component" v-model:open="modal1Open" />
-  =======
-  <!-- <a-modal v-model:open="modal1Open"> -->
-  <component :is="modal1Component" v-model:open="modal1Open" />
-  <!-- </a-modal> -->
-  >>>>>>> 7c654a40a88c1d0fdbac8e4dcbf23196a59944f7
 </template>
 
 <script setup>