Revert .gitmodules and update submodule pointers for ccpp-framework a…

…nd ccpp-physics
NOAA-EMC · Apr 28, 2021 · 7a6aeab · 7a6aeab
1 parent 0e427e1
commit 7a6aeab
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 10 deletions.
diff --git a/.gitmodules b/.gitmodules
@@ -4,13 +4,9 @@
 	branch = dev/emc
 [submodule "ccpp/framework"]
 	path = ccpp/framework
-	#url = https://github.com/NCAR/ccpp-framework
-	#branch = main
-	url = https://github.com/climbfuji/ccpp-framework
-	branch = always_copy_data_in
+	url = https://github.com/NCAR/ccpp-framework
+	branch = main
 [submodule "ccpp/physics"]
 	path = ccpp/physics
-	#url = https://github.com/NCAR/ccpp-physics
-	#branch = main
-	url = https://github.com/climbfuji/ccpp-physics
-	branch = collect_various_prs_20210422
+	url = https://github.com/NCAR/ccpp-physics
+	branch = main
diff --git a/ccpp/framework b/ccpp/framework
diff --git a/ccpp/physics b/ccpp/physics