From 3fec2e0938225dacb7e2d3adc500c28338f3d80a Mon Sep 17 00:00:00 2001
From: Rebecca Mahany-Horton <rebeccamahany@gmail.com>
Date: Tue, 21 Nov 2023 12:13:56 -0500
Subject: [PATCH] Fix rebase whoops

---
 ee/tuf/finalize_linux.go | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/ee/tuf/finalize_linux.go b/ee/tuf/finalize_linux.go
index a424ddda09..0b935eff7a 100644
--- a/ee/tuf/finalize_linux.go
+++ b/ee/tuf/finalize_linux.go
@@ -64,15 +64,10 @@ func getInterpreter(executableLocation string) (string, error) {
 		return "", fmt.Errorf("reading .interp section: %w", err)
 	}
 
-<<<<<<< HEAD
-	// interpData should look something like "/lib64/ld-linux-x86-64.so.2"
-	return filepath.Base(string(interpData)), nil
-=======
 	trimmedInterpData := bytes.TrimRight(interpData, "\x00")
 
 	// interpData should look something like "/lib64/ld-linux-x86-64.so.2" -- grab just the filename
 	return filepath.Base(string(trimmedInterpData)), nil
->>>>>>> 2741611e2760c9376e13a42d3ca8613bfe5253fb
 }
 
 func findInterpreterInNixStore(interpreter string) (string, error) {