fixed incorrect merge changes

dtcenter · Jan 17, 2024 · 3460f4b · 3460f4b
1 parent 2a7f3c7
commit 3460f4b
Show file tree

Hide file tree

Showing 5 changed files with 0 additions and 113 deletions.
diff --git a/data/config/GridStatConfig_default b/data/config/GridStatConfig_default
@@ -270,7 +270,6 @@ ugrid_coordinates_file = "";
 
 ////////////////////////////////////////////////////////////////////////////////
 
-
 grid_weight_flag = NONE;
 tmp_dir          = "/tmp";
 output_prefix    = "";

diff --git a/data/config/PointStatConfig_default b/data/config/PointStatConfig_default
@@ -305,7 +305,6 @@ ugrid_coordinates_file = "";
 
 ////////////////////////////////////////////////////////////////////////////////
 
-
 tmp_dir        = "/tmp";
 output_prefix  = "";
 version        = "V12.0.0";

diff --git a/internal/scripts/installation/config/install_met_env.wcoss2_py3.10_secondary b/internal/scripts/installation/config/install_met_env.wcoss2_py3.10_secondary
diff --git a/internal/scripts/installation/modulefiles/11.1.0.lua_wcoss2 b/internal/scripts/installation/modulefiles/11.1.0.lua_wcoss2
diff --git a/internal/scripts/installation/modulefiles/11.1.0_acorn b/internal/scripts/installation/modulefiles/11.1.0_acorn