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

Add merge test #248

Merged
merged 1 commit into from
Aug 28, 2017
Merged

Add merge test #248

merged 1 commit into from
Aug 28, 2017

Conversation

Xaeroxe
Copy link
Member

@Xaeroxe Xaeroxe commented Aug 28, 2017

Adds a test to verify that common::Merge works. Addresses one test box in #244

torkleyy
torkleyy approved these changes Aug 28, 2017
View reviewed changes
Copy link
Member

@torkleyy torkleyy left a comment

Choose a reason for hiding this comment

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

Nice, thank you!

@torkleyy
Copy link
Member

bors r+

bors bot added a commit that referenced this pull request Aug 28, 2017
@bors
Merge #248
d2891fe 
248: Add merge test r=torkleyy a=Xaeroxe

Adds a test to verify that common::Merge works.  Addresses one test box in #244
@bors
Copy link
Contributor

bors bot commented Aug 28, 2017

Build succeeded

@bors bors bot merged commit e7622be into amethyst:master Aug 28, 2017
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@torkleyy torkleyy torkleyy 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.
2 participants
@Xaeroxe @torkleyy