From e70f465c246dc00e27e9e42333dbb9d2c4aa471f Mon Sep 17 00:00:00 2001
From: gifrerenom <lluis.gifre@cttc.es>
Date: Fri, 2 Jun 2023 08:44:54 +0000
Subject: [PATCH] Pre-merge code cleanup

---
 src/policy/target/kubernetes/kubernetes.yml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/policy/target/kubernetes/kubernetes.yml b/src/policy/target/kubernetes/kubernetes.yml
index f56e184ae..f1079230f 100644
--- a/src/policy/target/kubernetes/kubernetes.yml
+++ b/src/policy/target/kubernetes/kubernetes.yml
@@ -12,7 +12,6 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 ---
->>>>>>> 7d8a70789d7e1f21d4dd4aa245ca9030ea496c52
 apiVersion: v1
 kind: Service
 metadata:
-- 
GitLab