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

Fix conflicts

Browse Source
This commit is contained in:
Daniel Imms
2019-06-12 18:25:05 -07:00
parent 7c6db2ef5b
commit ee81f50f3a
5 changed files with 12 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/renderer/webgl/renderLayer/BaseRenderLayer.ts
+2 -2
View File
@@ -4,12 +4,12 @@
*/
import { IRenderLayer } from './Types';
import { ICellData } from '../../../core/Types';
import { ICellData } from '../../../common/Types';
import { DEFAULT_COLOR } from '../../../common/Types';
import { DIM_OPACITY, INVERTED_DEFAULT_COLOR, IGlyphIdentifier } from '../atlas/Types';
import BaseCharAtlas from '../atlas/BaseCharAtlas';
import { acquireCharAtlas } from '../atlas/CharAtlasCache';
import { CellData, AttributeData, WHITESPACE_CELL_CHAR, WHITESPACE_CELL_CODE } from '../../../core/buffer/BufferLine';
import { CellData, AttributeData, WHITESPACE_CELL_CHAR, WHITESPACE_CELL_CODE } from '../../../common/buffer/BufferLine';
import { IColorSet, IRenderDimensions, Terminal } from 'xterm';
export abstract class BaseRenderLayer implements IRenderLayer {