From 1e2c598ca507b03898e19a702bb26a0628c8dace Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Thu, 23 Nov 2023 01:44:01 +0000
Subject: [PATCH] Fix merge conflict in v0.238.0

Release notes: https://github.com/dependabot/dependabot-core/releases/tag/v0.238.0
---
 common/lib/dependabot.rb |  2 +-
 updater/Gemfile.lock     | 68 ++++++++++++++++++++--------------------
 2 files changed, 35 insertions(+), 35 deletions(-)

diff --git a/common/lib/dependabot.rb b/common/lib/dependabot.rb
index c63f15a2022..6ea21b44891 100644
--- a/common/lib/dependabot.rb
+++ b/common/lib/dependabot.rb
@@ -2,5 +2,5 @@
 # frozen_string_literal: true
 
 module Dependabot
-  VERSION = "0.237.0"
+  VERSION = "0.238.0"
 end
diff --git a/updater/Gemfile.lock b/updater/Gemfile.lock
index e340ebb6509..a7b8862c518 100644
--- a/updater/Gemfile.lock
+++ b/updater/Gemfile.lock
@@ -1,19 +1,19 @@
 PATH
   remote: ../bundler
   specs:
-    dependabot-bundler (0.237.0)
-      dependabot-common (= 0.237.0)
+    dependabot-bundler (0.238.0)
+      dependabot-common (= 0.238.0)
 
 PATH
   remote: ../cargo
   specs:
-    dependabot-cargo (0.237.0)
-      dependabot-common (= 0.237.0)
+    dependabot-cargo (0.238.0)
+      dependabot-common (= 0.238.0)
 
 PATH
   remote: ../common
   specs:
-    dependabot-common (0.237.0)
+    dependabot-common (0.238.0)
       aws-sdk-codecommit (~> 1.28)
       aws-sdk-ecr (~> 1.5)
       bundler (>= 1.16, < 3.0.0)
@@ -35,64 +35,64 @@ PATH
 PATH
   remote: ../composer
   specs:
-    dependabot-composer (0.237.0)
-      dependabot-common (= 0.237.0)
+    dependabot-composer (0.238.0)
+      dependabot-common (= 0.238.0)
 
 PATH
   remote: ../docker
   specs:
-    dependabot-docker (0.237.0)
-      dependabot-common (= 0.237.0)
+    dependabot-docker (0.238.0)
+      dependabot-common (= 0.238.0)
 
 PATH
   remote: ../elm
   specs:
-    dependabot-elm (0.237.0)
-      dependabot-common (= 0.237.0)
+    dependabot-elm (0.238.0)
+      dependabot-common (= 0.238.0)
 
 PATH
   remote: ../git_submodules
   specs:
-    dependabot-git_submodules (0.237.0)
-      dependabot-common (= 0.237.0)
+    dependabot-git_submodules (0.238.0)
+      dependabot-common (= 0.238.0)
       parseconfig (~> 1.0, < 1.1.0)
 
 PATH
   remote: ../github_actions
   specs:
-    dependabot-github_actions (0.237.0)
-      dependabot-common (= 0.237.0)
+    dependabot-github_actions (0.238.0)
+      dependabot-common (= 0.238.0)
 
 PATH
   remote: ../go_modules
   specs:
-    dependabot-go_modules (0.237.0)
-      dependabot-common (= 0.237.0)
+    dependabot-go_modules (0.238.0)
+      dependabot-common (= 0.238.0)
 
 PATH
   remote: ../gradle
   specs:
-    dependabot-gradle (0.237.0)
-      dependabot-common (= 0.237.0)
-      dependabot-maven (= 0.237.0)
+    dependabot-gradle (0.238.0)
+      dependabot-common (= 0.238.0)
+      dependabot-maven (= 0.238.0)
 
 PATH
   remote: ../hex
   specs:
-    dependabot-hex (0.237.0)
-      dependabot-common (= 0.237.0)
+    dependabot-hex (0.238.0)
+      dependabot-common (= 0.238.0)
 
 PATH
   remote: ../maven
   specs:
-    dependabot-maven (0.237.0)
-      dependabot-common (= 0.237.0)
+    dependabot-maven (0.238.0)
+      dependabot-common (= 0.238.0)
 
 PATH
   remote: ../npm_and_yarn
   specs:
-    dependabot-npm_and_yarn (0.237.0)
-      dependabot-common (= 0.237.0)
+    dependabot-npm_and_yarn (0.238.0)
+      dependabot-common (= 0.238.0)
 
 PATH
   remote: ../nuget
@@ -104,26 +104,26 @@ PATH
 PATH
   remote: ../pub
   specs:
-    dependabot-pub (0.237.0)
-      dependabot-common (= 0.237.0)
+    dependabot-pub (0.238.0)
+      dependabot-common (= 0.238.0)
 
 PATH
   remote: ../python
   specs:
-    dependabot-python (0.237.0)
-      dependabot-common (= 0.237.0)
+    dependabot-python (0.238.0)
+      dependabot-common (= 0.238.0)
 
 PATH
   remote: ../swift
   specs:
-    dependabot-swift (0.237.0)
-      dependabot-common (= 0.237.0)
+    dependabot-swift (0.238.0)
+      dependabot-common (= 0.238.0)
 
 PATH
   remote: ../terraform
   specs:
-    dependabot-terraform (0.237.0)
-      dependabot-common (= 0.237.0)
+    dependabot-terraform (0.238.0)
+      dependabot-common (= 0.238.0)
 
 GEM
   remote: https://rubygems.org/