Merge branch 'develop' into fix/updatepsutily

dragetd · web-flow · commit f2b16ffd0921 · 2020-04-03T13:25:22.000+02:00
diff --git a/.github/renovate.json b/.github/renovate.json
@@ -1,6 +1,6 @@
 {
   "extends": [
     "config:base",
-    "rebaseWhen:behind-base-branch"
-  ]
+  ],
+  "rebaseWhen": "behind-base-branch"
 }

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"extends": [`
`3`	`3`	`"config:base",`
`4`		`- "rebaseWhen:behind-base-branch"`
`5`		`- ]`
	`4`	`+ ],`
	`5`	`+ "rebaseWhen": "behind-base-branch"`
`6`	`6`	`}`