From 72ff8973a241b8b1924c768ee1cb063e7c2bb7cc Mon Sep 17 00:00:00 2001
From: Tyera Eulberg <teulberg@gmail.com>
Date: Mon, 29 Mar 2021 15:00:25 -0600
Subject: [PATCH] Revert "Print the rust version when building bpf programs
 (#16181) (#16182)" (#16200)

This reverts commit cc7342a8ef719cbc1d44b37b8bcd8d6296e46598.
---
 sdk/bpf/scripts/install.sh | 11 -----------
 1 file changed, 11 deletions(-)

diff --git a/sdk/bpf/scripts/install.sh b/sdk/bpf/scripts/install.sh
index 82d56eeaee..41c9e569da 100755
--- a/sdk/bpf/scripts/install.sh
+++ b/sdk/bpf/scripts/install.sh
@@ -192,18 +192,7 @@ if [[ ! -e rust-bpf-sysroot-$version.md || ! -e rust-bpf-sysroot ]]; then
   if [[ $exitcode -ne 0 ]]; then
     exit 1
   fi
-<<<<<<< HEAD
   touch rust-bpf-sysroot-$version.md
-=======
-  touch bpf-tools-$version.md
-  set -ex
-  ./bpf-tools/rust/bin/rustc --version
-  ./bpf-tools/rust/bin/rustc --print sysroot
-  set +e
-  rustup toolchain uninstall bpf
-  set -e
-  rustup toolchain link bpf bpf-tools/rust
->>>>>>> abada56ba... Print the rust version when building bpf programs (#16181)
 fi
 
 exit 0