no message

src/modules/05_placement/components/PersonalList/Table.vue

@@ -556,7 +556,6 @@ const paginationLabel = (start: number, end: number, total: number) => {
 </script>
 <template>
   <q-form ref="myForm">
-<<<<<<< HEAD
       <Table :contain-status="containStatus" :rows="rows" :columns="columns" :filter="filter"
         :visible-columns="visibleColumns" v-model:inputfilter="filter" v-model:inputvisible="visibleColumns"
         v-model:editvisible="editvisible" v-model:containfilter="containStatus"
@@ -577,51 +576,6 @@ const paginationLabel = (start: number, end: number, total: number) => {
                     <div class="text-weight-medium">{{ props.row.name }}</div>
                     <div class="text-weight-light">{{ props.row.idCard }}</div>
                   </div>
-=======
-    <Table
-      :contain-status="containStatus"
-      :rows="rows"
-      :columns="columns"
-      :filter="filter"
-      :visible-columns="visibleColumns"
-      v-model:inputfilter="filter"
-      v-model:inputvisible="visibleColumns"
-      v-model:editvisible="editvisible"
-      v-model:containfilter="containStatus"
-      @update-modaladdlist="handleModalAddListUpdate"
-      :history="true"
-      :boss="true"
-      :saveNoDraft="true"
-      :role-admin="roleAdmin"
-      :displayAdd="displayAdd"
-    >
-      <template #columns="props">
-        <q-tr :props="props">
-          <q-td
-            v-for="col in props.cols"
-            :key="col.name"
-            :props="props"
-            @click="selectData(props.row.personalId)"
-            class="cursor-pointer"
-          >
-            <template v-if="col.name === 'position'">
-              {{ props.rowIndex + 1 }}
-            </template>
-            <template
-              v-else-if="col.name === 'fullName'"
-              class="table_ellipsis"
-            >
-              <div class="row col-12 text-no-wrap items-center">
-                <img
-                  v-if="props.row.avatar == null"
-                  src="@/assets/avatar_user.jpg"
-                  class="col-4 img-info"
-                />
-                <img v-else :src="props.row.avatar" class="col-4 img-info" />
-                <div class="col-4">
-                  <div class="text-weight-medium">{{ props.row.name }}</div>
-                  <div class="text-weight-light">{{ props.row.idCard }}</div>
->>>>>>> nice_dev
                 </div>
               </template>
               <template v-else-if="col.name === 'examNumber'">