1 files changed, 0 insertions, 4 deletions

diff --git a/Cargo.lock b/Cargo.lock
index f7fe347a0a5..6a588b512e2 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -3616,12 +3616,8 @@ dependencies = [
  "log",
  "once_cell",
  "rustc",
-<<<<<<< HEAD
  "rustc-rayon",
-=======
- "rustc-rayon 0.3.0",
  "rustc_codegen_llvm",
->>>>>>> rustc: Link LLVM directly into rustc again
  "rustc_codegen_ssa",
  "rustc_codegen_utils",
  "rustc_data_structures",