-=======
-=======
-<<<<<<< 4735b1c7edf0c31073b61bd51db919beceb3313f
->>>>>>> Update html-diff-rs dependency
-<<<<<<< 4d5150ce19b0eefca97d213249e34f20036613fe
- "libc 0.2.27 (registry+https://github.com/rust-lang/crates.io-index)",
-=======
-<<<<<<< HEAD
-<<<<<<< HEAD
-<<<<<<< HEAD
- "libc 0.2.26 (registry+https://github.com/rust-lang/crates.io-index)",
-=======
-=======
->>>>>>> Make html_diff compiles only after stage0
-<<<<<<< HEAD
- "libc 0.2.24 (registry+https://github.com/rust-lang/crates.io-index)",
-=======
- "libc 0.2.22 (registry+https://github.com/rust-lang/crates.io-index)",
->>>>>>> Add warnings when rustdoc html rendering differs
-<<<<<<< HEAD
->>>>>>> Add warnings when rustdoc html rendering differs
-<<<<<<< 72aaf7b7580c2f6b6e4a12f6d4b1c3a85a30d6c4
->>>>>>> Add warnings when rustdoc html rendering differs
-<<<<<<< HEAD
->>>>>>> Add warnings when rustdoc html rendering differs
-=======
-=======
-=======
-=======
- "libc 0.2.23 (registry+https://github.com/rust-lang/crates.io-index)",
->>>>>>> Make html_diff compiles only after stage0
->>>>>>> Make html_diff compiles only after stage0
-<<<<<<< 97bfcb5eb0f5284c03eecdb06a0273272564b82d
->>>>>>> Make html_diff compiles only after stage0
-<<<<<<< HEAD
->>>>>>> Make html_diff compiles only after stage0
-=======
-=======
-=======
- "libc 0.2.24 (registry+https://github.com/rust-lang/crates.io-index)",
->>>>>>> Update unstable-crate test
->>>>>>> Update unstable-crate test
-<<<<<<< HEAD
->>>>>>> Update unstable-crate test
-=======
-=======
- "libc 0.2.26 (registry+https://github.com/rust-lang/crates.io-index)",
->>>>>>> Update html-diff-rs dependency
->>>>>>> Update html-diff-rs dependency
-=======
- "libc 0.2.28 (registry+https://github.com/rust-lang/crates.io-index)",
->>>>>>> Update to last master