resolve conflict

Author: jjuracka

PWGUD/Tasks/upcRhoAnalysis.cxx

@@ -775,15 +775,15 @@ struct UpcRhoAnalysis {
 
     // fill recoTree
     recoTree(collision.flags(), collision.runNumber(), collision.posZ(),
-         energyCommonZNA, energyCommonZNC, timeZNA, timeZNC, neutronClass,
-         leadingTrack.sign(), subleadingTrack.sign(),
-         leadingPt, subleadingPt,
-         leadingEta, subleadingEta,
-         leadingPhi, subleadingPhi,
-         leadingTrack.tpcNSigmaPi(), subleadingTrack.tpcNSigmaPi(),
-         leadingTrack.tpcNSigmaEl(), subleadingTrack.tpcNSigmaEl(),
-         leadingTrack.tpcNSigmaKa(), subleadingTrack.tpcNSigmaKa(),
-         leadingTrack.tpcNSigmaPr(), subleadingTrack.tpcNSigmaPr());
+             energyCommonZNA, energyCommonZNC, timeZNA, timeZNC, neutronClass,
+             leadingTrack.sign(), subleadingTrack.sign(),
+             leadingPt, subleadingPt,
+             leadingEta, subleadingEta,
+             leadingPhi, subleadingPhi,
+             leadingTrack.tpcNSigmaPi(), subleadingTrack.tpcNSigmaPi(),
+             leadingTrack.tpcNSigmaEl(), subleadingTrack.tpcNSigmaEl(),
+             leadingTrack.tpcNSigmaKa(), subleadingTrack.tpcNSigmaKa(),
+             leadingTrack.tpcNSigmaPr(), subleadingTrack.tpcNSigmaPr());
 
     if (!tracksPassPID(cutTracks)) // apply PID cut
       return;