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 merge conflict #1808

Merged
merged 1 commit into from
May 30, 2018
Merged

Fix merge conflict #1808

merged 1 commit into from
May 30, 2018

Conversation

AkihiroSuda
Copy link
Member

This was referenced May 30, 2018
Merged
Closed
Closed
@cyphar
Copy link
Member

cyphar commented May 30, 2018 •
edited by caniszczyk
Loading

LGTM.

Approved with PullApprove

@AkihiroSuda AkihiroSuda mentioned this pull request May 30, 2018
Closed
@crosbymichael
Copy link
Member

crosbymichael commented May 30, 2018 •
edited by caniszczyk
Loading

LGTM

Approved with PullApprove

@crosbymichael crosbymichael merged commit ecd55a4 into opencontainers:master May 30, 2018
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@AkihiroSuda @cyphar @crosbymichael