ByoungSooPark/modeling-app
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge main

Browse Source
This commit is contained in:
github-actions[bot]
2024-08-08 23:55:20 +00:00
committed by Adam Chalmers
parent 956f00c5a1
commit b54a17a4fa
21 changed files with 7859 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/components/LowerRightControls.tsx
View File

@ -93,7 +93,15 @@ export function LowerRightControls({
<Link
to={
location.pathname.includes(PATHS.FILE)
<<<<<<< HEAD
? filePath + PATHS.SETTINGS + '?tab=project'
||||||| parent of 1f27643b (Merge main)
location.pathname.includes(paths.FILE)
? filePath + paths.SETTINGS + '?tab=project'
: paths.HOME + paths.SETTINGS
=======
? filePath + PATHS.SETTINGS_PROJECT
>>>>>>> 1f27643b (Merge main)
: PATHS.HOME + PATHS.SETTINGS
}
data-testid="settings-link"