Fix dumb rebase errors.

ORNL · Dec 2, 2023 · b22cfcd · b22cfcd
1 parent 7ed4915
commit b22cfcd
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 5 deletions.
diff --git a/resolve/LinSolver.cpp b/resolve/LinSolver.cpp
@@ -173,7 +173,7 @@ namespace ReSolve
     return conv_cond_;
   }
 
-  bool  LinSolverIterativeFGMRES::getFlexible()
+  bool  LinSolverIterative::getFlexible()
   {
     return flexible_;
   }
@@ -198,7 +198,7 @@ namespace ReSolve
     this->conv_cond_ = new_conv_cond;
   }
 
-  void  LinSolverIterativeFGMRES::setFlexible(bool new_flex)
+  void  LinSolverIterative::setFlexible(bool new_flex)
   {
     this->flexible_ = new_flex;
   }

diff --git a/tests/functionality/CMakeLists.txt b/tests/functionality/CMakeLists.txt
@@ -23,18 +23,15 @@ if(RESOLVE_USE_CUDA)
   # Build KLU+GLU test
   add_executable(klu_glu_test.exe testKLU_GLU.cpp)
   target_link_libraries(klu_glu_test.exe PRIVATE ReSolve)
-<<<<<<< HEAD
 
   # Build randSolver test
   add_executable(rand_gmres_cuda_test.exe testRandGMRES_Cuda.cpp)
   target_link_libraries(rand_gmres_cuda_test.exe PRIVATE ReSolve)
-=======
 
   # System solver test with GLU
   add_executable(sys_cuda_test.exe testSysCuda.cpp)
   target_link_libraries(sys_cuda_test.exe PRIVATE ReSolve)
 
->>>>>>> e627c59 (First stab at system solver.)
 endif(RESOLVE_USE_CUDA)