From 5333af4c9efdf279c9bb7c0aa953badb72d813d7 Mon Sep 17 00:00:00 2001
From: Pedro Algarvio <palgarvio@vmware.com>
Date: Fri, 12 Aug 2022 15:07:20 +0100
Subject: [PATCH] Remove conflicts

Signed-off-by: Pedro Algarvio <palgarvio@vmware.com>
---
 kitchen.macos.yml | 10 ----------
 1 file changed, 10 deletions(-)

diff --git a/kitchen.macos.yml b/kitchen.macos.yml
index dea3c21..845bace 100644
--- a/kitchen.macos.yml
+++ b/kitchen.macos.yml
@@ -19,20 +19,10 @@ platforms:
   - name: macos-1015
 
 suites:
-<<<<<<< HEAD
-  - name: py3-stable-3002
-    provisioner:
-      salt_version: 3002.8
-  - name: py3-stable-3003
-    provisioner:
-      salt_version: 3003.4
-  - name: py3-stable-3004
-=======
   - name: stable-3003
     provisioner:
       salt_version: 3003.4
   - name: stable-3004
->>>>>>> origin/develop
     provisioner:
       salt_version: 3004.1
   - name: latest