Merge branch 'develop' into gributil_wgrib

JCSDA · May 21, 2024 · 0c7e9cf · 0c7e9cf
2 parents 2fe6ed5 + 3b96b38
commit 0c7e9cf
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 5 deletions.
diff --git a/.gitmodules b/.gitmodules
@@ -1,9 +1,7 @@
 [submodule "spack"]
   path = spack
-  #url = https://github.com/jcsda/spack
-  #branch = spack-stack-dev
-  url = https://github.com/climbfuji/spack
-  branch = feature/merge_spack_develop_into_spack_stack_dev_20240509
+  url = https://github.com/jcsda/spack
+  branch = spack-stack-dev
 [submodule "doc/CMakeModules"]
   path = doc/CMakeModules
   url = https://github.com/noaa-emc/cmakemodules

diff --git a/spack b/spack