Commit 825b60ce authored by Dave Moxey's avatar Dave Moxey

Revert subrepo update

parent 5f3c9547
...@@ -6,5 +6,5 @@ ...@@ -6,5 +6,5 @@
[submodule "docs/developer-guide"] [submodule "docs/developer-guide"]
branch = master branch = master
path = docs/developer-guide path = docs/developer-guide
url = git@gitlab.nektar.info:nektar/developer-guide url = git@gitlab.nektar.info:nektar/developer-guide.git
ignore = all ignore = all
Subproject commit b1461b45abb08c48397fe6d046249703c4f8f160
...@@ -61,12 +61,9 @@ ADD_NEKTAR_TEST(Helmholtz3D_CG_Tet) ...@@ -61,12 +61,9 @@ ADD_NEKTAR_TEST(Helmholtz3D_CG_Tet)
ADD_NEKTAR_TEST(Helmholtz3D_CG_Tet_VarP) ADD_NEKTAR_TEST(Helmholtz3D_CG_Tet_VarP)
ADD_NEKTAR_TEST(Helmholtz3D_CG_Tet_VarP_iterLE) ADD_NEKTAR_TEST(Helmholtz3D_CG_Tet_VarP_iterLE)
ADD_NEKTAR_TEST(Helmholtz3D_CG_Prism) ADD_NEKTAR_TEST(Helmholtz3D_CG_Prism)
<<<<<<< HEAD
ADD_NEKTAR_TEST(Helmholtz3D_CG_Prism_VarP) ADD_NEKTAR_TEST(Helmholtz3D_CG_Prism_VarP)
ADD_NEKTAR_TEST(Helmholtz3D_CG_Prism_VarP_iterLE) ADD_NEKTAR_TEST(Helmholtz3D_CG_Prism_VarP_iterLE)
ADD_NEKTAR_TEST(Helmholtz3D_CG_Prism_iter_ml) ADD_NEKTAR_TEST(Helmholtz3D_CG_Prism_iter_ml)
=======
>>>>>>> master
ADD_NEKTAR_TEST(Helmholtz3D_CG_Prism_Deformed) ADD_NEKTAR_TEST(Helmholtz3D_CG_Prism_Deformed)
ADD_NEKTAR_TEST(Helmholtz3D_CG_Pyr) ADD_NEKTAR_TEST(Helmholtz3D_CG_Pyr)
ADD_NEKTAR_TEST(Helmholtz3D_CG_Pyr_VarP) ADD_NEKTAR_TEST(Helmholtz3D_CG_Pyr_VarP)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment