From 39d0b13c4f1a25f61a787bced2157f2717d98deb Mon Sep 17 00:00:00 2001
From: Shreyas Goenka <shreyas.goenka@databricks.com>
Date: Wed, 5 Mar 2025 10:29:57 +0100
Subject: [PATCH] -

---
 libs/auth/env.go | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/libs/auth/env.go b/libs/auth/env.go
index ddf73c986..08282e463 100644
--- a/libs/auth/env.go
+++ b/libs/auth/env.go
@@ -4,10 +4,6 @@ import (
 	"fmt"
 	"os"
 	"slices"
-<<<<<<< HEAD
-	"sort"
-=======
->>>>>>> origin
 	"strings"
 
 	"github.com/databricks/databricks-sdk-go/config"