From 097a3e00ab03b4820e7afd6816483932ff129422 Mon Sep 17 00:00:00 2001
From: Thomas Ubensee <34603111+tomuben@users.noreply.github.com>
Date: Tue, 12 Nov 2024 13:40:22 -0300
Subject: [PATCH] #958: Fix conda version conflict

---
 .current_gitmodules          | 2 +-
 doc/changes/changes_8.4.0.md | 2 ++
 script-languages             | 2 +-
 3 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/.current_gitmodules b/.current_gitmodules
index ee30c5ec..066b61b2 100644
--- a/.current_gitmodules
+++ b/.current_gitmodules
@@ -1 +1 @@
-160000 dfcc16523028c7b980e394eb8bed829de968da0a 0	script-languages
+160000 ba951587d1698df77e2d4a8286d7c4c5c9c61160 0	script-languages
diff --git a/doc/changes/changes_8.4.0.md b/doc/changes/changes_8.4.0.md
index 135021ed..2564d604 100644
--- a/doc/changes/changes_8.4.0.md
+++ b/doc/changes/changes_8.4.0.md
@@ -42,6 +42,8 @@ This release uses version 1.0.0 of the container tool.
   - #977: Fixed Trivy update cache workflow
   - #993: Added escape sequence for backslash in new Script Options parser
   - #1002: Use ECR fallback repository for Trivy caching
+  - #958: Fix conda version conflict
+
 ## Doc
 
  - #954: added release checklist
\ No newline at end of file
diff --git a/script-languages b/script-languages
index dfcc1652..ba951587 160000
--- a/script-languages
+++ b/script-languages
@@ -1 +1 @@
-Subproject commit dfcc16523028c7b980e394eb8bed829de968da0a
+Subproject commit ba951587d1698df77e2d4a8286d7c4c5c9c61160