run ./util/dev update_lints

[rust.git] / README.md

diff --git a/README.md b/README.md
index f42771709fb7720cb8925da1e4f1d507e90e0e41..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:
 
@@ -151,6 +157,10 @@ Note: `deny` produces errors instead of warnings.
 
 If you do not want to include your lint levels in your code, you can globally enable/disable lints by passing extra flags to Clippy during the run: `cargo clippy -- -A clippy::lint_name` will run Clippy with `lint_name` disabled and `cargo clippy -- -W clippy::lint_name` will run it with that enabled. This also works with lint groups. For example you can run Clippy with warnings for all lints enabled: `cargo clippy -- -W clippy::pedantic`
 
+## Contributing
+
+If you want to contribute to Clippy, you can find more information in [CONTRIBUTING.md](https://github.com/rust-lang/rust-clippy/blob/master/CONTRIBUTING.md).
+
 ## License
 
 Copyright 2014-2018 The Rust Project Developers