Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request xtermjs#2003 from Tyriar/fix_merge_problem
Fix compile error from conflicting PRs
- Loading branch information