-
Notifications
You must be signed in to change notification settings - Fork 0
디렉토리 변경에 따른 경로 수정 (#issue 295) #297
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Changes from 2 commits
File filter
Filter by extension
Conversations
Jump to
Diff view
Diff view
There are no files selected for viewing
Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.
| Original file line number | Diff line number | Diff line change | ||||||||||
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| @@ -1,4 +1,8 @@ | ||||||||||||
| import * as S from './PhoneComponent.styled'; | ||||||||||||
| <<<<<<< HEAD | ||||||||||||
| ======= | ||||||||||||
| import { ApplySchemeType } from '../../../../pages/user/apply/Apply'; | ||||||||||||
| >>>>>>> 4069f4a (chore: 디렉토리 변경에 따른 경로수정) | ||||||||||||
|
||||||||||||
| <<<<<<< HEAD | |
| ======= | |
| import { ApplySchemeType } from '../../../../pages/user/apply/Apply'; | |
| >>>>>>> 4069f4a (chore: 디렉토리 변경에 따른 경로수정) | |
| import { ApplySchemeType } from '../../../../pages/user/apply/Apply'; |
🧰 Tools
🪛 Biome (1.9.4)
[error] 5-5: numbers cannot be followed by identifiers directly after
an identifier cannot appear here
(parse)
🤖 Prompt for AI Agents
In src/components/user/applyComponents/phoneComponent/PhoneComponent.tsx around
lines 2 to 5, there are leftover merge conflict markers (<<<<<<< HEAD, =======,
>>>>>>> 4069f4a) that must be removed. Resolve the conflict by deleting these
markers and keeping the correct import statement for ApplySchemeType from
'../../../../pages/user/apply/Apply'. Ensure the file contains only valid import
statements without any conflict markers.
Uh oh!
There was an error while loading. Please reload this page.