solve clang

Author: AlexianL

PWGMM/Mult/Tasks/mftReassociationValidation.cxx

@@ -17,7 +17,11 @@
 
 #include "Common/CCDB/EventSelectionParams.h"
 #include "Common/CCDB/RCTSelectionFlags.h"
+<<<<<<< changes_mftReasso
 #include "Common/Core/fwdtrackUtilities.h"
+  == == ==
+  =
+>>>>>>> master
 #include "Common/DataModel/CollisionAssociationTables.h"
 #include "Common/DataModel/EventSelection.h"
 #include "Common/DataModel/McCollisionExtra.h"
@@ -27,7 +31,11 @@
 #include <CCDB/CcdbApi.h>
 #include <CommonConstants/MathConstants.h>
 #include <DataFormatsParameters/GRPMagField.h>
+    < < < < < < < changes_mftReasso
 #include <DetectorsBase/Propagator.h>
+    == == ==
+  =
+>>>>>>> master
 #include <Framework/AnalysisDataModel.h>
 #include <Framework/AnalysisHelpers.h>
 #include <Framework/AnalysisTask.h>
@@ -39,7 +47,11 @@
 #include <Framework/Logger.h>
 #include <Framework/O2DatabasePDGPlugin.h>
 #include <Framework/runDataProcessing.h>
+    < < < < < < < changes_mftReasso
 #include <ReconstructionDataFormats/TrackFwd.h>
+    == == ==
+  =
+>>>>>>> master
 
 #include <THn.h>
 #include <TString.h>
@@ -56,7 +68,7 @@
 #include <unordered_map>
 #include <vector>
 
-using namespace o2;
+    using namespace o2;
 using namespace o2::aod::rctsel;
 using namespace o2::aod::track;
 using namespace o2::constants::math;