Remove merge markers

This commit is contained in:
Florian Gilcher 2019-08-15 15:24:26 +02:00
parent d3c67148b7
commit da10be50c9
No known key found for this signature in database
GPG key ID: E7B51D33F8EBF61B

View file

@ -19,25 +19,15 @@ For detailed information, take a look at the [documentation][docs] and the assoc
Add the following lines to you `Cargo.toml`:
<<<<<<< HEAD
```
git clone git@github.com:async-rs/async-std.git && cd async-std
=======
```toml
[dependencies]
async-std = "0.99"
>>>>>>> Start a new README
```
Or use [cargo add][cargo-add] if you have it installed:
<<<<<<< HEAD
```
cargo doc --features docs --open
=======
```sh
$ cargo add async-std
>>>>>>> Start a new README
```
[cargo add]: https://github.com/killercup/cargo-edit