fix(timeout-spec): fix merge conflicts

trxcllnt · Feb 15, 2017 · 119e0d4 · 119e0d4
1 parent e14c7b8
commit 119e0d4
Showing 1 changed file with 0 additions and 6 deletions.
diff --git a/spec/operators/timeout-spec.ts b/spec/operators/timeout-spec.ts
@@ -2,12 +2,6 @@ import { expect } from 'chai';
 import * as Rx from '../../dist/cjs/Rx';
 import marbleTestingSignature = require('../helpers/marble-testing'); // tslint:disable-line:no-require-imports
 
-declare const { asDiagram };
-declare const hot: typeof marbleTestingSignature.hot;
-declare const cold: typeof marbleTestingSignature.cold;
-declare const expectObservable: typeof marbleTestingSignature.expectObservable;
-declare const expectSubscriptions: typeof marbleTestingSignature.expectSubscriptions;
-
 declare const { asDiagram };
 declare const rxTestScheduler: Rx.TestScheduler;
 declare const hot: typeof marbleTestingSignature.hot;