From 88305afae341a33966c125fdd0aa38f0421ac382 Mon Sep 17 00:00:00 2001
From: Dom Heinzeller <dom.heinzeller@icloud.com>
Date: Mon, 17 Jun 2024 05:45:15 -0600
Subject: [PATCH] Revert .gitmodules and update submodule pointer for spack

---
 .gitmodules | 6 ++----
 spack       | 2 +-
 2 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/.gitmodules b/.gitmodules
index 96f55267a..a69f3e4f1 100644
--- 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/update_mapl_from_spack_dev_20240613
+  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
index cdbee7332..93bf14d6d 160000
--- a/spack
+++ b/spack
@@ -1 +1 @@
-Subproject commit cdbee7332cc761bd86d9d824f5a3edae0c5635ad
+Subproject commit 93bf14d6d3bb14df154d1417aa41d7bbdd481d95