[숫자형] 충돌 해결 (6.35.toFixed(1) == 6.3인 이유 과제 해답)

Author: zerohyun00

1-js/05-data-types/02-number/2-why-rounded-down/solution.md

@@ -28,10 +28,6 @@ alert( (6.35 * 10).toFixed(20) ); // 63.50000000000000000000
 
 
 ```js run
-<<<<<<< HEAD
 alert( Math.round(6.35 * 10) / 10); // 6.35 -> 63.5 -> 64(반올림됨) -> 6.4
-=======
-alert( Math.round(6.35 * 10) / 10 ); // 6.35 -> 63.5 -> 64(rounded) -> 6.4
->>>>>>> upstream/master
 ```