fix last conflict

cms-sw · Sep 1, 2014 · b22b841 · b22b841
1 parent 77114a6
commit b22b841
Showing 1 changed file with 0 additions and 4 deletions.
diff --git a/Validation/RecoVertex/src/PrimaryVertexAnalyzer4PUSlimmed.cc b/Validation/RecoVertex/src/PrimaryVertexAnalyzer4PUSlimmed.cc
@@ -264,11 +264,7 @@ void PrimaryVertexAnalyzer4PUSlimmed::bookHistograms(
                  &log_pt2_bins[0]);
     mes_[label]["GenAllAssoc2Reco_NumTracks"] =
         i.book1D("GenAllAssoc2Reco_NumTracks",
-<<<<<<< HEAD
-                 "GeneratedAllAssoc2Reco_NumTracks", 100, 0., 200.);
-=======
                  "GeneratedAllAssoc2Reco_NumTracks", 24, &log_ntrk_bins[0]);
->>>>>>> 14d4019... rebin again
     mes_[label]["GenAllAssoc2Reco_ClosestDistanceZ"] =
         i.book1D("GenAllAssoc2Reco_ClosestDistanceZ",
                  "GeneratedAllAssoc2Reco_ClosestDistanceZ", 30, &log_bins[0]);