Merge pull request #1121 from climbfuji/feature/merge_spack_develop_i…

…nto_spack_stack_dev_20240509_BUGFIX_PTR Bug fix after merging spack-stack PR 1109 before spack submodule PR JCSDA/spack#432
JCSDA · May 21, 2024 · 3b96b38 · 3b96b38
2 parents 296cd59 + 78699bc
commit 3b96b38
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