Skip to content

Commit 518d9b2

Browse files
committed
Fix merge error in utils
1 parent 75282df commit 518d9b2

1 file changed

Lines changed: 0 additions & 22 deletions

File tree

danfojs/src/core/utils.js

Lines changed: 0 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -428,29 +428,7 @@ export class Utils {
428428
if (return_val) {
429429
result_arr.push(val_count);
430430
} else {
431-
<<<<<<< HEAD
432431
result_arr.push(null_count);
433-
=======
434-
let result_arr = []
435-
arr.map(ele_arr => {
436-
let null_count = 0
437-
let val_count = 0
438-
ele_arr.map(ele => {
439-
if (isNaN(ele) && typeof ele != "string") {
440-
null_count = null_count + 1
441-
} else {
442-
val_count = val_count + 1
443-
}
444-
})
445-
if (val) {
446-
result_arr.push(val_count)
447-
} else {
448-
result_arr.push(null_count)
449-
}
450-
})
451-
return result_arr
452-
453-
>>>>>>> 140069d5ee29a7f877894ddb2b3fd6ab2b375917
454432
}
455433
});
456434
return result_arr;

0 commit comments

Comments
 (0)