From 3a57f04b673e4b6f2d90980aa49eb84d5f07feb8 Mon Sep 17 00:00:00 2001
From: jeanluc <2163936+lkubb@users.noreply.github.com>
Date: Mon, 7 Oct 2024 22:02:33 +0000
Subject: [PATCH] Fix merge conflict

---
 pyproject.toml | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/pyproject.toml b/pyproject.toml
index 52687c2..dacccf1 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -35,7 +35,7 @@ classifiers = [
 requires-python = ">= 3.8"
 dynamic = ["version"]
 dependencies = [
-<<<<<<< before updating
+    "salt>=3006",
     "azure-batch==12.0.0",
     "azure-common==1.1.28",
     "azure-graphrbac==0.61.1",
@@ -62,10 +62,6 @@ dependencies = [
     "azure-storage-queue==12.3.0",
     "msrest==0.7.1",
     "msrestazure==0.6.4",
-    "salt>=3005",
-=======
-    "salt>=3006",
->>>>>>> after updating
 ]
 
 [project.readme]