From c22b83aa6cd05b93b0302b701132234dcfa34371 Mon Sep 17 00:00:00 2001
From: Jack May <jack@solana.com>
Date: Tue, 2 Mar 2021 01:00:26 -0800
Subject: [PATCH] resolve conflicts

---
 sdk/bpf/scripts/install.sh | 17 ++---------------
 1 file changed, 2 insertions(+), 15 deletions(-)

diff --git a/sdk/bpf/scripts/install.sh b/sdk/bpf/scripts/install.sh
index b1f449c468..41c9e569da 100755
--- a/sdk/bpf/scripts/install.sh
+++ b/sdk/bpf/scripts/install.sh
@@ -159,22 +159,9 @@ if [[ ! -e rust-bpf-$machine-$version.md || ! -e rust-bpf-$machine ]]; then
     job="download \
            https://github.com/solana-labs/rust-bpf-builder/releases/download \
            $version \
-<<<<<<< HEAD
            solana-rust-bpf-$machine.tar.bz2 \
            rust-bpf-$machine"
     get $version rust-bpf-$machine "$job"
-
-    set -ex
-    ./rust-bpf-$machine/bin/rustc --print sysroot
-    set +e
-    rustup toolchain uninstall bpf
-    set -e
-    rustup toolchain link bpf rust-bpf-$machine
-=======
-           solana-bpf-tools-$machine.tar.bz2 \
-           bpf-tools"
-    get $version bpf-tools "$job"
->>>>>>> 4789a13a6... configure rust-bpf toolchain for each tree (#15620)
   )
   exitcode=$?
   if [[ $exitcode -ne 0 ]]; then
@@ -183,11 +170,11 @@ if [[ ! -e rust-bpf-$machine-$version.md || ! -e rust-bpf-$machine ]]; then
   touch rust-bpf-$machine-$version.md
 fi
 set -ex
-./bpf-tools/rust/bin/rustc --print sysroot
+./rust-bpf-$machine/bin/rustc --print sysroot
 set +e
 rustup toolchain uninstall bpf
 set -e
-rustup toolchain link bpf bpf-tools/rust
+rustup toolchain link bpf rust-bpf-$machine
 
 # Install Rust-BPF Sysroot sources
 version=v0.14