Skip to content

Commit bc80e14

Browse files
committed
Merge remote-tracking branch 'upstream/master' into update/upstream
2 parents 0241318 + bd0c9f8 commit bc80e14

File tree

2 files changed

+3
-2
lines changed

2 files changed

+3
-2
lines changed

gradlew

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

renovate.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,5 +6,6 @@
66
],
77
"labels": ["Renovate"],
88
"rebaseWhen": "conflicted",
9-
"schedule": ["on the first day of the month"]
9+
"schedule": ["on the first day of the month"],
10+
"automerge": true
1011
}

0 commit comments

Comments
 (0)