resolving o2 linter issues

JosueMtzGar · JosueMtzGar · commit 053abe8d9b0a · 2025-11-17T01:28:29.000-06:00
diff --git a/PWGCF/TwoParticleCorrelations/Tasks/CMakeLists.txt b/PWGCF/TwoParticleCorrelations/Tasks/CMakeLists.txt
@@ -74,10 +74,6 @@ o2physics_add_dpl_workflow(long-range-dihadron-cor
                            COMPONENT_NAME Analysis)
 
 o2physics_add_dpl_workflow(two-particle-correlation-pp
-<<<<<<< HEAD
                            SOURCES twoParticleCorrelationPp.cxx
-=======
-                           SOURCES twoParticleCorrelationpp.cxx
->>>>>>> 60963c422 (adding a basis task for two particle correlation for pp)
                            PUBLIC_LINK_LIBRARIES O2Physics::AnalysisCore O2Physics::PWGCFCore
                            COMPONENT_NAME Analysis)
