eiac/xterm.js
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

Fix missed merge conflict

Browse Source
This commit is contained in:
Daniel Imms
2019-05-12 09:45:09 -07:00
parent f7612a49d2
commit 0c588a7333
1 changed files with 1 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/Terminal.ts
+1 -5
View File
@@ -43,11 +43,7 @@ import { DEFAULT_BELL_SOUND, SoundManager } from './SoundManager';
import { MouseZoneManager } from './MouseZoneManager';
import { AccessibilityManager } from './AccessibilityManager';
import { ScreenDprMonitor } from './ui/ScreenDprMonitor';
<<<<<<< HEAD
import { ITheme, IMarker, IDisposable, ITerminalAddon } from 'xterm';
=======
import { ITheme, IMarker, IDisposable, ISelectionPosition } from 'xterm';
>>>>>>> ups/master
import { ITheme, IMarker, IDisposable, ITerminalAddon, ISelectionPosition } from 'xterm';
import { removeTerminalFromCache } from './renderer/atlas/CharAtlasCache';
import { DomRenderer } from './renderer/dom/DomRenderer';
import { IKeyboardEvent } from './common/Types';