rebase

laraxot · Sep 4, 2023 · 42428bc · 42428bc
1 parent 9e9716e
commit 42428bc
Showing 1 changed file with 6 additions and 0 deletions.
diff --git a/.github/dependabot.yml b/.github/dependabot.yml
@@ -5,6 +5,9 @@ updates:
     schedule:
       interval: "daily"
 <<<<<<< HEAD
+<<<<<<< HEAD
+=======
+>>>>>>> c0a5fb1 (up)
 
   - package-ecosystem: "github-actions"
     directory: "/"
@@ -20,5 +23,8 @@ updates:
     labels:
       - "npm"
       - "dependencies"
+<<<<<<< HEAD
 =======
 >>>>>>> 95a4930 (.)
+=======
+>>>>>>> c0a5fb1 (up)