merge conflict fixed

This commit is contained in:
2024-12-11 16:50:34 -05:00
parent e26ffde6c0
commit 7d9018ecb1
8 changed files with 418 additions and 36 deletions

View File

@@ -29,31 +29,31 @@
"@types/*": [
"/src/types/*"],
"@components/*": [
"/src/components/*",
"/src/components/ui/*",
"/src/components/Brands/*"
"./src/components/*",
"./src/components/ui/*",
"./src/components/Brands/*"
],
"@actions/*": [
"/src/actions/*"
"./src/actions/*"
],
"@layouts/*": [
"/src/components/layouts/*"
"./src/components/layouts/*"
],
"@fragments/*": [
"/src/app/Fragments/*"
"./src/app/Fragments/*"
],
"@lib/*": [
"@lib/*",
"/src/lib/*"
"./src/lib/*"
],
"scss/*": [
"./src/scss/*"
],
"admin/*": [
"src/components/Admin/*"
"./src/components/Admin/*"
],
"products/*": [
"src/components/Products/*"
"./src/components/Products/*"
]
},