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.

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

chore: fixed merge conflicts from traits exercises added by s-marios #274

Merged
merged 2 commits into from Feb 25, 2020

Conversation

sjmann
Copy link
Contributor

@sjmann sjmann commented Feb 25, 2020

I hope this doesn't step on any toes but I wanted to try the traits exercises from #216 so I updated them to match the new structure with hints included in info.toml

Copy link
Member

@shadows-withal shadows-withal left a comment

Choose a reason for hiding this comment

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

Looks good, thanks!

@shadows-withal
Copy link
Member

@bors: r+

@bors
Copy link
Contributor

bors commented Feb 25, 2020

📌 Commit dc84aac has been approved by fmoko

@bors
Copy link
Contributor

bors commented Feb 25, 2020

⌛ Testing commit dc84aac with merge 78295ce...

@bors
Copy link
Contributor

bors commented Feb 25, 2020

☀️ Test successful - checks-travis
Approved by: fmoko
Pushing 78295ce to master...

@bors bors merged commit 78295ce into rust-lang:master Feb 25, 2020
pedantic79 pushed a commit to pedantic79/rustlings that referenced this pull request Apr 11, 2020
chore: fixed merge conflicts from traits exercises added by s-marios

I hope this doesn't step on any toes but I wanted to try the traits exercises from rust-lang#216 so I updated them to match the new structure with hints included in info.toml
ppp3 pushed a commit to ppp3/rustlings that referenced this pull request May 23, 2022
chore: fixed merge conflicts from traits exercises added by s-marios

I hope this doesn't step on any toes but I wanted to try the traits exercises from rust-lang#216 so I updated them to match the new structure with hints included in info.toml
dmoore04 pushed a commit to dmoore04/rustlings that referenced this pull request Sep 11, 2022
chore: fixed merge conflicts from traits exercises added by s-marios

I hope this doesn't step on any toes but I wanted to try the traits exercises from rust-lang#216 so I updated them to match the new structure with hints included in info.toml
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants