From b30fcb6ac3d5cdc66842dceaf376c31110a2fbd0 Mon Sep 17 00:00:00 2001
From: Nicolas Savoire <nicolas.savoire@datadoghq.com>
Date: Thu, 3 Oct 2024 14:09:01 +0000
Subject: [PATCH] Fix bad merge

---
 .github/dependabot.yml | 11 -----------
 1 file changed, 11 deletions(-)

diff --git a/.github/dependabot.yml b/.github/dependabot.yml
index 63b790c..5b1b32f 100644
--- a/.github/dependabot.yml
+++ b/.github/dependabot.yml
@@ -5,14 +5,3 @@ updates:
     directory: /
     schedule:
       interval: daily
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
-
-  - package-ecosystem: pip
-    directory: /_integration-tests/utils/agent
-    schedule:
-      interval: daily
->>>>>>> 3b149a3 (Prepare repository for opensourcing)
-=======
->>>>>>> 5e446e9 (Address review comments.)