From 150d328d2e70b4cbc63d0f7d2dc802e1d6d2ac39 Mon Sep 17 00:00:00 2001
From: Aaron Hill <aa1ronham@gmail.com>
Date: Wed, 11 Dec 2019 09:50:46 -0500
Subject: [PATCH] Update Cargo.lock

---
 Cargo.lock | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index f7fe347a0a52..6a588b512e20 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",