rebased kstar code

Author: Sawan Sawan

PWGLF/Tasks/Resonances/kstarqa.cxx

@@ -1729,13 +1729,18 @@ struct Kstarqa {
       if (!selectionEvent(RecCollision, false)) // don't fill event cut histogram
         continue;
 
+<<<<<<< HEAD
 <<<<<<< HEAD
       // const auto& mcCollisionRec = RecCollision.mcCollision_as<EventMCGenerated>();
       // multiplicityRec = mcCollisionRec.centFT0M();
 =======
       const auto& mcCollisionRec = RecCollision.mcCollision_as<EventMCGenerated>();
       multiplicityRec = mcCollisionRec.centFT0M();
 >>>>>>> 087e3b03d (different event/signal loss method)
+=======
+      // const auto& mcCollisionRec = RecCollision.mcCollision_as<EventMCGenerated>();
+      // multiplicityRec = mcCollisionRec.centFT0M();
+>>>>>>> 61d6a6024 (removed unused variable)
 
       if (cSelectMultEstimator == kFT0M) {
         multiplicity1 = RecCollision.centFT0M();