From f5491ba7422c85c9eac9372f838490c74455c097 Mon Sep 17 00:00:00 2001
From: Britania Rodriguez Reyes <britaniar@microsoft.com>
Date: Wed, 6 Nov 2024 16:09:03 -0800
Subject: [PATCH] restore

---
 apis/placement/v1alpha1/zz_generated.deepcopy.go | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/apis/placement/v1alpha1/zz_generated.deepcopy.go b/apis/placement/v1alpha1/zz_generated.deepcopy.go
index 402500599..1a3f72658 100644
--- a/apis/placement/v1alpha1/zz_generated.deepcopy.go
+++ b/apis/placement/v1alpha1/zz_generated.deepcopy.go
@@ -10,11 +10,7 @@ Licensed under the MIT license.
 package v1alpha1
 
 import (
-<<<<<<< HEAD
 	v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
-=======
-	"k8s.io/apimachinery/pkg/apis/meta/v1"
->>>>>>> 27aa8f2 (add cloudConfig & some tests)
 	runtime "k8s.io/apimachinery/pkg/runtime"
 	"k8s.io/apimachinery/pkg/util/intstr"