Skip to content

Commit da10be5

Browse files
committed
Remove merge markers
1 parent d3c6714 commit da10be5

File tree

1 file changed

+0
-10
lines changed

1 file changed

+0
-10
lines changed

README.md

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -19,25 +19,15 @@ For detailed information, take a look at the [documentation][docs] and the assoc
1919

2020
Add the following lines to you `Cargo.toml`:
2121

22-
<<<<<<< HEAD
23-
```
24-
git clone git@github.com:async-rs/async-std.git && cd async-std
25-
=======
2622
```toml
2723
[dependencies]
2824
async-std = "0.99"
29-
>>>>>>> Start a new README
3025
```
3126

3227
Or use [cargo add][cargo-add] if you have it installed:
3328

34-
<<<<<<< HEAD
35-
```
36-
cargo doc --features docs --open
37-
=======
3829
```sh
3930
$ cargo add async-std
40-
>>>>>>> Start a new README
4131
```
4232

4333
[cargo add]: https://github.com/killercup/cargo-edit

0 commit comments

Comments
 (0)