Fixing merge conflicts for the folder structure

Infisical · Jan 15, 2023 · 72d52c9 · 72d52c9
1 parent b1f7505
commit 72d52c9
Showing 1 changed file with 0 additions and 0 deletions.
diff --git a/frontend/components/basic/Layout.tsx → frontend/src/components/basic/Layout.tsx b/frontend/components/basic/Layout.tsx → frontend/src/components/basic/Layout.tsx