[skip-ci] fix renovate.json

jsanz · web-flow · commit 7362df62eb77 · 2025-09-24T15:53:32.000+02:00
diff --git a/renovate.json b/renovate.json
@@ -1,10 +1,7 @@
 {
   "$schema": "https://docs.renovatebot.com/renovate-schema.json",
-<<<<<<< HEAD
-=======
   "enabled": true,
   "minimumReleaseAge": "14 days",
->>>>>>> eb7de40 (Revert "[skip-ci] Disable renovate" (#482))
   "extends": [
     "github>elastic/renovate-config"
   ]

Original file line number	Diff line number	Diff line change
`@@ -1,10 +1,7 @@`
`1`	`1`	`{`
`2`	`2`	`"$schema": "https://docs.renovatebot.com/renovate-schema.json",`
`3`		`-<<<<<<< HEAD`
`4`		`-=======`
`5`	`3`	`"enabled": true,`
`6`	`4`	`"minimumReleaseAge": "14 days",`
`7`		`->>>>>>> eb7de40 (Revert "[skip-ci] Disable renovate" (#482))`
`8`	`5`	`"extends": [`
`9`	`6`	`"github>elastic/renovate-config"`
`10`	`7`	`]`