Commit b56f7ee

committed

conflict file update

1 parent 52ada74 commit b56f7eeCopy full SHA for b56f7ee

File tree

-0

lines changed

-0

lines changed

Lines changed: 4 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -22,6 +22,7 @@ function solution(x) {`
`22`	`22`	`}`
`23`	`23`	`// x가 각 자릿수의 합으로 나누어떨어지는지 여부 반환`
`24`	`24`	`return x % sum_of_digits == 0;`
	`25`	`+<<<<<<< HEAD`
`25`	`26`	`}`
`26`	`27`
`27`	`28`	`//정답 3 - jaewon1676`
`@@ -35,3 +36,6 @@ function solution(x) {`
`35`	`36`
`36`	`37`	`return (x % sum == 0) ? true : false; // 자릿수의 합으로 x가 나누어지면 하샤드 수`
`37`	`38`	`}`
	`39`	`+=======`
	`40`	`+}`
	`41`	`+>>>>>>> f3acd4e (Update 히샤드-수.js)`

Comments

(0)