Merge branch 'master' into dependabot/npm_and_yarn/typescript-eslint/…

…eslint-plugin-6.19.0
punxaphil · Jan 22, 2024 · 4ca0990 · 4ca0990
2 parents 34fa179 + ca6b0ec
commit 4ca0990
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 9 deletions.
diff --git a/.github/workflows/dependabot-automerge.yml b/.github/workflows/dependabot-automerge.yml
@@ -19,7 +19,7 @@ jobs:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
 
       - name: 'Auto Merge'
-        uses: pascalgn/automerge-action@v0.15.6
+        uses: pascalgn/automerge-action@v0.16.2
         if: steps.waitforstatuschecks.outputs.status == 'success'
         env:
           MERGE_LABELS: "update"

diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -10,7 +10,7 @@
   "dependencies": {
     "@mdi/js": "^7.4.47",
     "custom-card-helpers": "^1.9.0",
-    "lit": "^3.1.0"
+    "lit": "^3.1.1"
   },
   "devDependencies": {
     "@babel/core": "^7.23.7",