Remove merge markers

tosocketaddrs
Florian Gilcher 5 years ago
parent d3c67148b7
commit da10be50c9
No known key found for this signature in database
GPG Key ID: E7B51D33F8EBF61B

@ -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`: Add the following lines to you `Cargo.toml`:
<<<<<<< HEAD
```
git clone git@github.com:async-rs/async-std.git && cd async-std
=======
```toml ```toml
[dependencies] [dependencies]
async-std = "0.99" async-std = "0.99"
>>>>>>> Start a new README
``` ```
Or use [cargo add][cargo-add] if you have it installed: Or use [cargo add][cargo-add] if you have it installed:
<<<<<<< HEAD
```
cargo doc --features docs --open
=======
```sh ```sh
$ cargo add async-std $ cargo add async-std
>>>>>>> Start a new README
``` ```
[cargo add]: https://github.com/killercup/cargo-edit [cargo add]: https://github.com/killercup/cargo-edit

Loading…
Cancel
Save