dev: missing merge conflict

2025-09-15 10:18:24 +07:00
parent 17a15d0e96
commit 792dbd7392
2 changed files with 0 additions and 8 deletions
@@ -33,11 +33,7 @@ const canRead = true // hasReadAccess(roleAccess)
 <template>
  <div>
    <div v-if="canRead">
-<<<<<<< HEAD
      <ContentEquipmentList />
-=======
-      <ContentMaterialList />
->>>>>>> 266d5f740b15942ca7b8845c00573640fdc9a3b2
    </div>
    <Error v-else :status-code="403" />
  </div>
@@ -33,11 +33,7 @@ const canRead = true // hasReadAccess(roleAccess)
 <template>
  <div>
    <div v-if="canRead">
-<<<<<<< HEAD:app/pages/(features)/tools-equipment-src/tools/index.vue
      <ContentToolsList />
-=======
-      <ContentDeviceList />
->>>>>>> 266d5f740b15942ca7b8845c00573640fdc9a3b2:app/pages/(features)/tools-equipment-src/device/index.vue
    </div>
    <Error v-else :status-code="403" />
  </div>