Skip to content

Commit 5837808

Browse files
authored
deleting the markers
1 parent 27f970f commit 5837808

File tree

1 file changed

+3
-3
lines changed

1 file changed

+3
-3
lines changed

Sprint-3/1-implement-and-rewrite-tests/implement/2-is-proper-fraction.js

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,13 +8,13 @@
88
// write one test at a time, and make it pass, build your solution up methodically
99

1010
function isProperFraction(numerator, denominator) {
11-
<<<<<<< HEAD
11+
1212
if (denominator) {
1313
return true;
14-
=======
14+
1515
if (typeof numerator !== "number" || typeof denominator !== "number") {
1616
return false; // Invalid input types
17-
>>>>>>> 52740052fb0ad97a2c7253a04978b14a15b9e763
17+
1818
}
1919

2020
if (denominator === 0) {

0 commit comments

Comments
 (0)