Skip to content

Commit

Permalink
Merge branch '1177-common-calorimeter-cluster-class' into pfReco
Browse files Browse the repository at this point in the history
Conflicts:
	Recon/src/Recon/Event/CaloCluster.cxx
  • Loading branch information
therwig committed Jul 18, 2023
2 parents 7c4ba9a + 9d40637 commit 9e392d7
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion Recon/src/Recon/Event/CaloCluster.cxx
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,6 @@ namespace ldmx {
vecIDs.push_back(hitsVec[iHit]->getID());
}
setIDs(vecIDs);
}
}

} // namespace ldmx

0 comments on commit 9e392d7

Please sign in to comment.