resolve conflicts

AlexanderRichert-NOAA · Sep 29, 2023 · a5b91b9 · a5b91b9
2 parents 685afa2 + 162c90e
commit a5b91b9
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 0 deletions.
diff --git a/configs/common/modules_lmod.yaml b/configs/common/modules_lmod.yaml
@@ -13,6 +13,7 @@ modules:
         nlohmann-json: 'json/{version}'
         nlohmann-json-schema-validator: 'json-schema-validator/{version}'
         libjpeg-turbo: 'libjpeg/{version}'
+        prod-util: 'prod_util/{version}'
       exclude:
       # List of packages for which we don't need modules
       - apple-libunwind

diff --git a/configs/common/modules_tcl.yaml b/configs/common/modules_tcl.yaml
@@ -15,6 +15,7 @@ modules:
         nlohmann-json: '{compiler.name}/{compiler.version}/json/{version}'
         nlohmann-json-schema-validator: '{compiler.name}/{compiler.version}/json-schema-validator/{version}'
         libjpeg-turbo: '{compiler.name}/{compiler.version}/libjpeg/{version}'
+        prod-util: '{compiler.name}/{compiler.version}/prod_util/{version}'
       exclude:
       # List of packages for which we don't need modules
       - apple-libunwind