Add sdk repo for CAPZ

giantswarm · Jul 23, 2024 · a4fbc00 · a4fbc00
1 parent 1d1ab93
commit a4fbc00
Showing 1 changed file with 0 additions and 4 deletions.
diff --git a/sdk/api/v1alpha1/types.go b/sdk/api/v1alpha1/types.go
@@ -7,10 +7,6 @@ import (
 const (
 	// ProviderAws represents the new AWS provider which is implemented with Cluster API.
 	ProviderAws Provider = "aws"
-<<<<<<< Updated upstream
-
-=======
->>>>>>> Stashed changes
 	// ProviderAzure represents the new Azure provider which is implemented with Cluster API.
 	ProviderAzure Provider = "azure"
 )