resolve merge conflicts

brayniac · Oct 19, 2023 · 0a334a3 · 0a334a3
2 parents 7aa9559 + b701800
commit 0a334a3
Show file tree

Hide file tree

Showing 15 changed files with 788 additions and 381 deletions.
diff --git a/.github/dependabot.yml b/.github/dependabot.yml
@@ -10,6 +10,6 @@ updates:
         patterns:
           - "*"
     open-pull-requests-limit: 10
-    versioning-strategy: auto
+    versioning-strategy: lockfile-only
     allow:
       - dependency-type: all