update

oap-project · Nov 1, 2024 · 321d15b · 321d15b
1 parent be13be9
commit 321d15b
Showing 1 changed file with 0 additions and 4 deletions.
diff --git a/mllib-dal/src/main/native/SummarizerImpl.cpp b/mllib-dal/src/main/native/SummarizerImpl.cpp
@@ -307,12 +307,8 @@ Java_com_intel_oap_mllib_stat_SummarizerDALImpl_cSummarizerTrainDAL(
     }
 #endif
     default: {
-<<<<<<< HEAD
         deviceError("Summarizer",
                     ComputeDeviceString[computeDeviceOrdinal].c_str());
-=======
-        deviceError("Summarizer", ComputeDeviceString[computeDeviceOrdinal].c_str());
->>>>>>> remove oneccl communicator
     }
     }
     return 0;