From a1480af17160e0b7a364bc359a9dd25f8128123c Mon Sep 17 00:00:00 2001
From: James McKinney <26463+jpmckinney@users.noreply.github.com>
Date: Wed, 8 May 2024 16:23:58 -0400
Subject: [PATCH] build: Upgrade OCDS Merge, which adds InconsistentTypeError

---
 requirements.txt        | 2 +-
 requirements.txt.sha256 | 2 +-
 requirements_dev.txt    | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/requirements.txt b/requirements.txt
index 38ae4bed..9f173f8a 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -91,7 +91,7 @@ ocdsextensionregistry==0.2.2
     # via ocdskit
 ocdskit[perf]==1.1.12
     # via -r requirements.in
-ocdsmerge==0.6.4
+ocdsmerge==0.6.6
     # via ocdskit
 odfpy==1.4.1
     # via flattentool
diff --git a/requirements.txt.sha256 b/requirements.txt.sha256
index 6a3f3aac..ef11a8e9 100644
--- a/requirements.txt.sha256
+++ b/requirements.txt.sha256
@@ -1 +1 @@
-f11a4af0851a25a1c885383faaa8de219e4d25b6789bce26614fa66a66957b96  requirements.txt
+ef31a10a64f9faaa049c269043e542fd9af14075b6e52449fcaae7781c344ff5  requirements.txt
diff --git a/requirements_dev.txt b/requirements_dev.txt
index 2f0d9c08..74dc8954 100644
--- a/requirements_dev.txt
+++ b/requirements_dev.txt
@@ -80,7 +80,7 @@ et-xmlfile==1.0.1
     # via
     #   -r requirements.txt
     #   openpyxl
-exceptiongroup==1.1.3
+exceptiongroup==1.2.1
     # via pytest
 filelock==3.4.1
     # via
@@ -163,7 +163,7 @@ ocdsextensionregistry==0.2.2
     #   ocdskit
 ocdskit[perf]==1.1.12
     # via -r requirements.txt
-ocdsmerge==0.6.4
+ocdsmerge==0.6.6
     # via
     #   -r requirements.txt
     #   -r requirements_dev.in