Skip to content

Commit 4a7cb3c

Browse files
authored
Merge pull request #49165 from adzel-werk/patch-1
Remove merge marks from Muon_FullChain_cfg.py
2 parents 1438756 + ec0bb87 commit 4a7cb3c

File tree

1 file changed

+0
-3
lines changed

1 file changed

+0
-3
lines changed

Validation/TrackerConfiguration/test/Muon_FullChain_cfg.py

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -56,11 +56,8 @@
5656

5757
process.load("Configuration.StandardSequences.Reconstruction_cff")
5858

59-
<<<<<<< Muon_FullChain_cfg.py
6059
#process.load("RecoTracker.TrackProducer.RefitterWithMaterial_cff")
61-
=======
6260
process.load("RecoTracker.TrackProducer.TrackRefitters_cff")
63-
>>>>>>> 1.4
6461

6562
process.load("Validation.TrackerRecHits.trackerRecHitsValidation_cff")
6663

0 commit comments

Comments
 (0)