mirror of
https://github.com/zhigang1992/DefinitelyTyped.git
synced 2026-04-24 05:06:02 +08:00
Resolve merge conflict
This commit is contained in:
@@ -1,6 +1,5 @@
|
||||
/// <reference path="ndarray.d.ts" />
|
||||
|
||||
import * as ndarray from 'ndarray';
|
||||
import ndarray = require('ndarray');
|
||||
|
||||
const data = new Int32Array(2 * 2 * 2 + 10);
|
||||
const a = ndarray(data, [2, 2, 2], [1, 2, 4], 5);
|
||||
@@ -24,4 +23,3 @@ console.log(a.get(0, 0, 0) === 1);
|
||||
console.log(a.index(1, 1, 1) === 12);
|
||||
|
||||
const b = a.lo(0, 0, 0).hi(1, 1, 1);
|
||||
const c = b.step(0).transpose(0, 0, 0).pick(null, null, 0);
|
||||
|
||||
Reference in New Issue
Block a user