diff options
| author | Aaron Hill <aa1ronham@gmail.com> | 2019-12-11 09:50:46 -0500 |
|---|---|---|
| committer | Aaron Hill <aa1ronham@gmail.com> | 2019-12-11 09:50:46 -0500 |
| commit | 150d328d2e70b4cbc63d0f7d2dc802e1d6d2ac39 (patch) | |
| tree | dc43ada9a7b0d7db82560f927916086b4b89a971 | |
| parent | 9245182420879321962ec63c6d8cf2d9a862316e (diff) | |
| download | rust-150d328d2e70b4cbc63d0f7d2dc802e1d6d2ac39.tar.gz rust-150d328d2e70b4cbc63d0f7d2dc802e1d6d2ac39.zip | |
Update Cargo.lock
| -rw-r--r-- | Cargo.lock | 4 |
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", |