optimised code

Author: Sawan Sawan

PWGLF/Tasks/Resonances/kstarqa.cxx

@@ -1846,17 +1846,10 @@ struct Kstarqa {
         // if (!(track1PDG == PDG_t::kKPlus && track2PDG == PDG_t::kPiPlus)) {
         //   continue;
         // }
-<<<<<<< HEAD
         if (selectionConfig.isPDGCheckMC && (track1PDG != PDG_t::kKPlus) && (track1PDG != PDG_t::kPiPlus)) {
           continue;
         }
         if (selectionConfig.isPDGCheckMC && (track2PDG != PDG_t::kKPlus) && (track2PDG != PDG_t::kPiPlus)) {
-=======
-        if (selectionConfig.isPDGCheckMC && ((track1PDG != PDG_t::kKPlus) || (track1PDG != PDG_t::kPiPlus))) {
-          continue;
-        }
-        if (selectionConfig.isPDGCheckMC && ((track2PDG != PDG_t::kKPlus) || (track2PDG != PDG_t::kPiPlus))) {
->>>>>>> 3eb28648a (added MID in MC)
           continue;
         }
         rEventSelection.fill(HIST("recMCparticles"), 6.5);