From 9c6cd622517a18d3dbfa2a96e3f89988b10e73fd Mon Sep 17 00:00:00 2001
From: Simon Cornet <simon.cornet@itcreation.nl>
Date: Wed, 11 Dec 2024 17:43:28 +0100
Subject: [PATCH] [ci] feat: fix renovate configuration

---
 renovate.json | 7 -------
 1 file changed, 7 deletions(-)

diff --git a/renovate.json b/renovate.json
index 66a44d2..da8f5e1 100644
--- a/renovate.json
+++ b/renovate.json
@@ -1,8 +1,3 @@
-<<<<<<< HEAD
-{
-  "$schema": "https://docs.renovatebot.com/renovate-schema.json"
-}
-=======
 { 
   "$schema": "https://docs.renovatebot.com/renovate-schema.json",
   "extends": [ "local>cicd/renovate" ],
@@ -10,5 +5,3 @@
     "fileMatch": [ "(.*).ya?ml$" ]
   }
 }
-
->>>>>>> 919b0e0 ([ci] feat: added renovate configuration)