From 2c78720189464ab78ef04965fd67371496e49bd6 Mon Sep 17 00:00:00 2001
From: "stephan.hadan" <stephan@hadan.de>
Date: Mon, 6 Jan 2025 11:45:47 +0100
Subject: [PATCH] Update renovate.json

fixed config
---
 renovate.json | 12 ------------
 1 file changed, 12 deletions(-)

diff --git a/renovate.json b/renovate.json
index 2cbe1c8..7190a60 100644
--- a/renovate.json
+++ b/renovate.json
@@ -1,15 +1,3 @@
 {
-<<<<<<< HEAD
   "$schema": "https://docs.renovatebot.com/renovate-schema.json"
-=======
-  "extends": [
-    "config:base"  
-  ],
-  "packageRules": [
-    {
-      "updateTypes": ["minor", "patch", "pin", "digest"],
-      "automerge": true
-    }
-  ]
->>>>>>> 223f4c6 (fixed pinterest icon and link)
 }