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

ui-spacetimechart: add fancy borders to conflicts layer #551

Merged
merged 1 commit into from
Oct 3, 2024
Merged

ui-spacetimechart: add fancy borders to conflicts layer #551

merged 1 commit into from
Oct 3, 2024

Conversation

emersion
Copy link
Member

@emersion emersion commented Sep 25, 2024 •
edited
Loading

@emersion emersion requested review from Yohh and Math-R September 30, 2024 12:53
@emersion emersion marked this pull request as ready for review September 30, 2024 12:54
@emersion emersion requested a review from a team as a code owner September 30, 2024 12:54
Yohh
Yohh approved these changes Oct 1, 2024
View reviewed changes
Copy link
Contributor

@Yohh Yohh left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

lgtm, don't forget to rebase

Math-R
Math-R approved these changes Oct 3, 2024
View reviewed changes
Copy link
Contributor

@Math-R Math-R left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Lgtm!

@emersion emersion added this pull request to the merge queue Oct 3, 2024
Merged via the queue into dev with commit 2a6cfe1 Oct 3, 2024
6 checks passed
@emersion emersion deleted the emr/conflict-borders branch October 3, 2024 13:36
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@Yohh Yohh Yohh approved these changes

@Math-R Math-R Math-R approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

spacetimechart: add fancy borders to conflicts layer
3 participants
@emersion @Yohh @Math-R