Skip to content

Commit c1fe27f

Browse files
committed
fix: resolve merge conflict in fligner-test main.js
1 parent 48d8b94 commit c1fe27f

1 file changed

Lines changed: 2 additions & 15 deletions

File tree

  • lib/node_modules/@stdlib/stats/fligner-test/lib

lib/node_modules/@stdlib/stats/fligner-test/lib/main.js

Lines changed: 2 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -50,16 +50,9 @@ var print = require( './print.js' ); // eslint-disable-line stdlib/no-redeclare
5050
function repeat( val, len ) {
5151
var out = [];
5252
var i;
53-
<<<<<<< HEAD
54-
for ( i = 0; i < len; i++ ) {
55-
out.push( val );
56-
}
57-
=======
58-
5953
for ( i = 0; i < len; i++ ) {
6054
out.push( val );
6155
}
62-
>>>>>>> upstream/develop
6356
return out;
6457
}
6558

@@ -164,20 +157,14 @@ function fligner() {
164157
}
165158
loc = median( args[ i ] );
166159
for ( j = 0; j < args[ i ].length; j++ ) {
167-
args[ i ][ j ] -= loc;
168-
}
169-
x = x.concat( args[ i ] );
160+
x.push( args[ i ][ j ] - loc );
161+
}
170162
}
171163
n = x.length;
172164
xabs = [];
173165
for ( i = 0; i < n; i++ ) {
174-
<<<<<<< HEAD
175-
xabs.push( abs( x[ i ] ) );
176-
}
177-
=======
178166
xabs.push( abs( x[ i ] ) );
179167
}
180-
>>>>>>> upstream/develop
181168
scores = ranks( xabs );
182169
a = [];
183170
mean = 0.0;

0 commit comments

Comments
 (0)