multiharmoniccorrelations

Pengchong Hu · Pengchong Hu · commit 8655b0a95909 · 2026-05-26T22:45:40.000+02:00
diff --git a/PWGCF/MultiparticleCorrelations/Tasks/CMakeLists.txt b/PWGCF/MultiparticleCorrelations/Tasks/CMakeLists.txt
@@ -28,8 +28,11 @@ o2physics_add_dpl_workflow(multiharmonic-correlations
                     SOURCES multiharmonicCorrelations.cxx
                     PUBLIC_LINK_LIBRARIES O2::Framework O2Physics::AnalysisCore O2Physics::PWGCFCore
                     COMPONENT_NAME Analysis)
+<<<<<<< HEAD
 
 o2physics_add_dpl_workflow(multiparticle-cumulants
                     SOURCES multiparticleCumulants.cxx
                     PUBLIC_LINK_LIBRARIES O2::Framework O2Physics::AnalysisCore O2Physics::PWGCFCore
                     COMPONENT_NAME Analysis)
+=======
+>>>>>>> fb3e94cf1176f17e0ef923e20450f3148807bddf
