Skip to content

[정기적 문제 풀이 추가 PR] 2022.04.05 #20

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

Jump to bottom
Merged
merged 39 commits into from
Apr 6, 2022
Merged

[정기적 문제 풀이 추가 PR] 2022.04.05 #20

merged 39 commits into from
Apr 6, 2022

Conversation

@prove-ability
Copy link
Contributor

@prove-ability prove-ability commented Apr 4, 2022

No description provided.

@prove-ability prove-ability self-assigned this Apr 4, 2022
@codeisneverodd
Copy link
Owner

codeisneverodd commented Apr 5, 2022

@prove-ability 용찬님! conflict 해결 부탁드립니다!
@jaewon1676
Copy link
Contributor

jaewon1676 commented Apr 5, 2022 •
edited
Loading

스크린샷 2022-04-05 오후 2 35 32

용찬님이 fork한 레포지토리에 파일 변경사항 업데이트가 되지 않아서 발생한 것 같습니다!
fork 해주신 레포지토리에서 Fetch and merge 후 vscode에서 git pull 후 진행 해주시면 좋을 것 같습니다.
@prove-ability prove-ability marked this pull request as ready for review April 6, 2022 06:31
@codeisneverodd codeisneverodd merged commit f2520e9 into codeisneverodd:main Apr 6, 2022
codeisneverodd
codeisneverodd reviewed Apr 6, 2022
View reviewed changes
Copy link
Owner

@codeisneverodd codeisneverodd left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

conflict 잘 해결하셨네요! 고생하셨습니다 😄
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

풀이 추가

5 participants

@prove-ability @codeisneverodd @jaewon1676 @yongchanson @chaerin-dev