[정기적 문제 풀이 추가 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.

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

codeisneverodd merged 39 commits into codeisneverodd:main from prove-ability:main

Apr 6, 2022

Merged

[정기적 문제 풀이 추가 PR] 2022年04月05日 #20

codeisneverodd merged 39 commits into codeisneverodd:main from prove-ability:main

Apr 6, 2022

Conversation

prove-ability

Copy link

Contributor

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

No description provided.

yongchanson and others added 16 commits

April 4, 2022 22:17

@yongchanson @prove-ability


 내적 - 솔루션 추가

3bce447

@yongchanson @prove-ability


 2016년 - 솔루션 추가

c0791e3

@yongchanson @prove-ability


 부족한-금액-계산하기 - 솔루션 추가

7ce8b59

@yongchanson @prove-ability


 가운데-글자-가져오기 - 솔루션 추가

746396e

@chaerin-dev @prove-ability


 Update 두-정수-사이의-합.js

abbd5d2

@chaerin-dev @prove-ability


 Update 문자열을-정수로-바꾸기.js

e1def10

@chaerin-dev @prove-ability


 Update 두-정수-사이의-합.js

d8c475a

@chaerin-dev @prove-ability


 Update 서울에서-김서방-찾기.js

@chaerin-dev @prove-ability


 Update 수박수박수박수박수박수.js

9ac0bb4

@chaerin-dev @prove-ability


 Update 짝수와-홀수.js

cd2dc2f

@chaerin-dev @prove-ability


 Update 콜라츠-추측.js

ddae8cc

@chaerin-dev @prove-ability


 Update 평균-구하기.js

f70fce8

@chaerin-dev @prove-ability


 Update 히샤드-수.js

b175003

@chaerin-dev @prove-ability


 Update 핸드폰-번호-가리기.js

b4b3d05

@prove-ability


 [풀이추가] 2022年04月04日, 1문제, 없는 숫자 더하기

@prove-ability


 [풀이추가] 2022年04月04日, 1문제, 신고 결과 받기

bc7cd22

@prove-ability prove-ability added the 풀이 추가 label

Apr 4, 2022

@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 and others added 10 commits

April 6, 2022 14:59

@prove-ability


 Update 음양-더하기.js

72f6776

@prove-ability


 Update 내적.js

ec7ae69

@jaewon1676 @prove-ability


 Update x만큼 간격이 있는 n개의 숫자.js

36e38fe

@jaewon1676 @prove-ability


 Update 수박수박수박수박수박수?.js

f24fae2

@jaewon1676 @prove-ability


 Update 약수의 개수와 덧셈.js

b8a39dc

@jaewon1676 @prove-ability


 Update 짝수와 홀수.js

093dfa3

@jaewon1676 @prove-ability


 Update 콜라츠 추측.js

0dd72c5

@jaewon1676 @prove-ability


 Update 히샤드 수.js

@jaewon1676 @prove-ability


 Update 다리를 지나는 트럭.js

a631752

@jaewon1676 @prove-ability


 Update 위장.js

b0fa059

jaewon1676 and others added 13 commits

April 6, 2022 15:00

@jaewon1676 @prove-ability


 [풀이 추가] 2022年04月04日, 1문제, 2 x n 타일링

@jaewon1676 @prove-ability


 [풀이 추가] 2022年04月04日, 1문제, 이중우선순위큐.js

@jaewon1676 @prove-ability


 [풀이 추가] 2022年04月04日, 1문제, 2_x_n_타일링.js

d9af555

@prove-ability


 conflict file update

1d01e52

@chaerin-dev @prove-ability


 Update 두-정수-사이의-합.js

feb4725

@prove-ability


 conflict file update

740d73f

@chaerin-dev @prove-ability


 Update 짝수와-홀수.js

8ec6b23

@chaerin-dev @prove-ability


 Update 콜라츠-추측.js

52ada74

@prove-ability


 conflict file update

b56f7ee

@jaewon1676 @prove-ability


 Update 수박수박수박수박수박수?.js

bb1bf9c

@prove-ability


 conflict file update

3635bab

@prove-ability


 conflict file update

@prove-ability


 Merge branch 'main' into main

74348f2

@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 잘 해결하셨네요! 고생하셨습니다 😄

Labels

풀이 추가

5 participants

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

Navigation Menu

Search code, repositories, users, issues, pull requests...

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

[정기적 문제 풀이 추가 PR] 2022年04月05日 #20

[정기적 문제 풀이 추가 PR] 2022年04月05日 #20

Uh oh!

Conversation

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

Uh oh!

codeisneverodd commented Apr 5, 2022

Uh oh!

jaewon1676 commented Apr 5, 2022 •

edited

Loading

Uh oh!

Uh oh!

@codeisneverodd codeisneverodd left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

[정기적 문제 풀이 추가 PR] 2022年04月05日 #20

[정기적 문제 풀이 추가 PR] 2022年04月05日 #20

Uh oh!

Conversation

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

Uh oh!

codeisneverodd commented Apr 5, 2022

Uh oh!

jaewon1676 commented Apr 5, 2022 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

@codeisneverodd codeisneverodd left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

jaewon1676 commented Apr 5, 2022 •

edited

Loading