diff options
| author | bors <bors@rust-lang.org> | 2020-02-25 21:27:39 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2020-02-25 21:27:39 +0000 |
| commit | 78295ce92fa5842e3eb1a05979fd22c4cb8191e8 (patch) | |
| tree | 1e0c866e0641d7c4e50837b5418360cd9f9daf13 /Cargo.toml | |
| parent | 358fb473cd3ebf06085b58f8c7ff1f649ec6ec7a (diff) | |
| parent | dc84aacc65392172164b728813449ecda8c3b6e6 (diff) | |
Auto merge of #274 - sjmann:master, r=fmoko
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 #216 so I updated them to match the new structure with hints included in info.toml
Diffstat (limited to 'Cargo.toml')
0 files changed, 0 insertions, 0 deletions