munawwirul_jamal/simrsx-fe
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

dev: missing merge conflict

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