mirror of
https://gitea.gofwd.group/dstrawsb/ballistic-builder.git
synced 2025-12-06 02:36:44 -05:00
merge conflict fixed
This commit is contained in:
@@ -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/*"
|
||||
]
|
||||
},
|
||||
|
||||
|
||||
Reference in New Issue
Block a user