From 1d1ab93552a43531012b10ae58f3721083cc5536 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Nick=20J=C3=BCttner?= <nick@giantswarm.io>
Date: Tue, 23 Jul 2024 15:12:36 +0200
Subject: [PATCH] Add sdk repo for CAPZ

---
 sdk/CHANGELOG.md          | 4 ++++
 sdk/api/v1alpha1/types.go | 3 +++
 2 files changed, 7 insertions(+)

diff --git a/sdk/CHANGELOG.md b/sdk/CHANGELOG.md
index 66c308e00..5b29fd3aa 100644
--- a/sdk/CHANGELOG.md
+++ b/sdk/CHANGELOG.md
@@ -9,6 +9,10 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+### Fixed
+
+- Add Azure provider as provider directory.
+
 ## [0.5.0] - 2024-07-23
 
 ### Added
diff --git a/sdk/api/v1alpha1/types.go b/sdk/api/v1alpha1/types.go
index 3a2e8548b..fb0bce6df 100644
--- a/sdk/api/v1alpha1/types.go
+++ b/sdk/api/v1alpha1/types.go
@@ -7,7 +7,10 @@ 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"
 )