Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix compile error from conflicting PRs #2003

Merged
merged 1 commit into from
Apr 7, 2019
Merged

Fix compile error from conflicting PRs #2003

merged 1 commit into from
Apr 7, 2019

Conversation

Tyriar
Copy link
Member

@Tyriar Tyriar commented Apr 7, 2019

Merging in when CI passes, this broke because I didn't update the true color branch for another CI run

@Tyriar Tyriar added this to the 3.13.0 milestone Apr 7, 2019
@Tyriar Tyriar self-assigned this Apr 7, 2019
@Tyriar Tyriar merged commit 2574577 into xtermjs:master Apr 7, 2019
@Tyriar Tyriar deleted the fix_merge_problem branch April 7, 2019 17:53
@Tyriar Tyriar mentioned this pull request May 10, 2019
Merged
10 tasks
@renovate renovate bot mentioned this pull request Jun 6, 2021
Closed
1 task
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees

@Tyriar Tyriar

Labels
None yet
Projects
None yet
Milestone
3.13.0
Development

Successfully merging this pull request may close these issues.
1 participant
@Tyriar