cleanup

databricks · Jul 29, 2024 · eeafcb4 · eeafcb4
1 parent 5d213dd
commit eeafcb4
Showing 1 changed file with 1 addition and 4 deletions.
diff --git a/bundle/config/validate/unique_resource_keys.go b/bundle/config/validate/unique_resource_keys.go
@@ -4,10 +4,7 @@ import (
 	"context"
 	"fmt"
 	"slices"
-<<<<<<< HEAD
-=======
 	"sort"
->>>>>>> origin
 
 	"github.com/databricks/cli/bundle"
 	"github.com/databricks/cli/libs/diag"
@@ -112,7 +109,7 @@ func (m *uniqueResourceKeys) Apply(ctx context.Context, b *bundle.Bundle) diag.D
 			Summary:   fmt.Sprintf("multiple resources have been defined with the same key: %s", k),
 			Locations: v.locations,
 			Paths:     v.paths,
-gs		})
+		})
 	}
 
 	return diags