Merge remote-tracking branch 'upstream/master' into update/upstream

OneLiteFeatherNET · Jun 15, 2024 · bc80e14 · bc80e14
2 parents 0241318 + bd0c9f8
commit bc80e14
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/gradlew b/gradlew
@@ -55,7 +55,7 @@
 #       Darwin, MinGW, and NonStop.
 #
 #   (3) This script is generated from the Groovy template
-#       https://github.com/gradle/gradle/blob/HEAD/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
+#       https://github.com/gradle/gradle/blob/HEAD/platforms/jvm/plugins-application/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
 #       within the Gradle project.
 #
 #       You can find Gradle at https://github.com/gradle/gradle/.

diff --git a/renovate.json b/renovate.json
@@ -6,5 +6,6 @@
   ],
   "labels": ["Renovate"],
   "rebaseWhen": "conflicted",
-  "schedule": ["on the first day of the month"]
+  "schedule": ["on the first day of the month"],
+  "automerge": true
 }