Merge remote-tracking branch 'ups/master' into pr/1148

2018-01-28 13:39:07 -08:00
parent fe53e1a091 098a3d0804
commit 106704b5d8
45 changed files with 563 additions and 619 deletions
@@ -3,8 +3,8 @@
 * @license MIT
 */

+import { FontWeight } from 'xterm';
 import { isFirefox } from './utils/Browser';
-import { FontWeight } from './Types';

 declare const Promise: any;