diff --git a/[refs] b/[refs] index 7a13c103dcffc..0302f34c9e67f 100644 --- a/[refs] +++ b/[refs] @@ -1,3 +1,3 @@ --- refs/heads/gh-pages: 09c786f70121f131b3715aaf3464996502bbeb7e -"refs/heads/CMSSW_7_1_X": 6978f0e58a3f6c07045706bfab8fcae514be81e3 +"refs/heads/CMSSW_7_1_X": e0bd451bb2665002b911b29e02283b9c4c6421d9 diff --git a/trunk/PhysicsTools/FWLite/interface/EventContainer.h b/trunk/PhysicsTools/FWLite/interface/EventContainer.h index c1b40715d55c2..b07203aabb3f3 100644 --- a/trunk/PhysicsTools/FWLite/interface/EventContainer.h +++ b/trunk/PhysicsTools/FWLite/interface/EventContainer.h @@ -97,7 +97,7 @@ namespace fwlite bool atEnd() const; - TriggerNames const& triggerNames (edm::TriggerResults const& triggerResults) + edm::TriggerNames const& triggerNames (edm::TriggerResults const& triggerResults) { return m_eventBasePtr->triggerNames (triggerResults); } Long64_t fileIndex() const