Commit 1d01e52

committed

conflict file update

1 parent d9af555 commit 1d01e52Copy full SHA for 1d01e52

File tree

-8

lines changed

-8

lines changed

Lines changed: 8 additions & 8 deletions

Original file line number	Diff line number	Diff line change
`@@ -4,16 +4,16 @@`
`4`	`4`	`function solution(a, b) {`
`5`	`5`	`var answer = 0;`
`6`	`6`	`for (let i = Math.min(a, b); i <= Math.max(a, b); i++) {`
`7`		`- answer += i`
	`7`	`+ answer += i;`
`8`	`8`	`}`
`9`	`9`	`return answer;`
`10`	`10`	`}`
`11`	`11`
`12`		`-//정답 2 - chaerin-dev`
	`12`	`+//정답 2 - chagrin-dev`
`13`	`13`	`function solution(a, b) {`
`14`		`- let answer = 0;`
`15`		`- for (let i = Math.min(a, b); i <= Math.max(a, b); i++) {`
`16`		`- answer += i;`
`17`		`- }`
`18`		`- return answer;`
`19`		`-}`
	`14`	`+ let answer = 0;`
	`15`	`+ for (let i = Math.min(a, b); i <= Math.max(a, b); i++) {`
	`16`	`+ answer += i;`
	`17`	`+ }`
	`18`	`+ return answer;`
	`19`	`+}`

Comments

(0)