run ./util/dev update_lints

[rust.git] / README.md

diff --git a/README.md b/README.md
index be24f1be8272ff29543a6cb1ec632e38c8662f3a..658b2a70adc2bfda300ac8ce798cf26c49699fd6 100644 (file)
--- a/README.md
+++ b/README.md
@@ -7,7 +7,13 @@
 
 A collection of lints to catch common mistakes and improve your [Rust](https://github.com/rust-lang/rust) code.
 
+<<<<<<< HEAD
+[There are 290 lints included in this crate!](https://rust-lang.github.io/rust-clippy/master/index.html)
+||||||| merged common ancestors
 [There are 291 lints included in this crate!](https://rust-lang.github.io/rust-clippy/master/index.html)
+=======
+[There are 293 lints included in this crate!](https://rust-lang.github.io/rust-clippy/master/index.html)
+>>>>>>> run ./util/dev update_lints
 
 We have a bunch of lint categories to allow you to choose how much Clippy is supposed to ~~annoy~~ help you:
 
@@ -79,7 +85,7 @@ To have cargo compile your crate with Clippy without Clippy installation
 in your code, you can use:
 
 ```terminal
-RUSTFLAGS=--sysroot=`rustc --print sysroot` cargo run --bin cargo-clippy --manifest-path=path_to_clippys_Cargo.toml
+cargo run --bin cargo-clippy --manifest-path=path_to_clippys_Cargo.toml
 ```
 
 *[Note](https://github.com/rust-lang/rust-clippy/wiki#a-word-of-warning):*