remove leftover conflict marker

Author: c-dilks

src/Analysis.cxx

@@ -748,7 +748,6 @@ void Analysis::AddFinalState(TString finalStateN) {
 //----------------------------------------------
 Bool_t Analysis::IsFinalState(TString finalState) {
   return std::find( activeFinalStates.begin(), activeFinalStates.end(), finalState) != activeFinalStates.end();
->>>>>>> add most dihadron kinematics calculations
 };