From b22cfcd7d0e71b05d5a6191e06df6be816573c40 Mon Sep 17 00:00:00 2001
From: Slaven Peles <peless@ornl.gov>
Date: Sat, 2 Dec 2023 16:04:18 -0500
Subject: [PATCH] Fix dumb rebase errors.

---
 resolve/LinSolver.cpp              | 4 ++--
 tests/functionality/CMakeLists.txt | 3 ---
 2 files changed, 2 insertions(+), 5 deletions(-)

diff --git a/resolve/LinSolver.cpp b/resolve/LinSolver.cpp
index d42e4c6e..7a6c450e 100644
--- 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
index 14634178..882e8a2f 100644
--- 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)