From 42428bc418443009b568154b4ae4eb1d84ea4598 Mon Sep 17 00:00:00 2001
From: Malebestia <vair81@gmail.com>
Date: Mon, 4 Sep 2023 13:17:40 +0200
Subject: [PATCH] rebase

---
 .github/dependabot.yml | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/.github/dependabot.yml b/.github/dependabot.yml
index 0e09f86b..3b45bb8e 100755
--- 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)