Skip to content

Modify: conflict #4

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.

Sign up for GitHub

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

Open
YunKukPark wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Modify: conflict #4

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion confilict.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# 충돌~~
이건 한문철도 못막는 충돌
이건 한문철도 못막는 충돌 ㅋㅋ루삥뽕 충돌 낼 거지롱~

박윤국 > 이줄 바뀐다.