Addressing pull issues

TejaX-Alaghari · Aug 17, 2022 · f5c61f3 · f5c61f3
2 parents 510ff46 + 690c54a
commit f5c61f3
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 0 deletions.
diff --git a/cmake/FindCompiler.cmake b/cmake/FindCompiler.cmake
@@ -62,3 +62,4 @@ if(is_dpcpp)
   endif()
 
 endif()
+
diff --git a/src/blas/backends/rocblas/rocblas_scope_handle.hpp b/src/blas/backends/rocblas/rocblas_scope_handle.hpp
@@ -24,6 +24,7 @@
 #include <thread>
 #include <atomic>
 #include <unordered_map>
+<<<<<<< HEAD
 #include "rocblas_helper.hpp"
 
 namespace oneapi {