---

yaml --- r: 62198 b: refs/heads/l1tmuon-upgrade-dev c: 197cc2d h: refs/heads/l1tmuon-upgrade-dev
cms-sw · Mar 17, 2009 · 45749f6 · 45749f6
1 parent f0793ef
commit 45749f6
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 11 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/l1tmuon-upgrade-dev: 9bfeb5a7ddb0d39737413c9b4bf1af9c3e13966b
+refs/heads/l1tmuon-upgrade-dev: 197cc2d93e72313a705db9facd7f10c274925da3
diff --git a/trunk/RecoLocalTracker/SiStripClusterizer/plugins/SealModules.cc b/trunk/RecoLocalTracker/SiStripClusterizer/plugins/SealModules.cc
@@ -6,15 +6,5 @@ DEFINE_SEAL_MODULE();
 #include "RecoLocalTracker/SiStripClusterizer/plugins/SiStripClusterizer.h"
 DEFINE_ANOTHER_FWK_MODULE(SiStripClusterizer);
 
-<<<<<<< SealModules.cc
-using cms::SiStripClusterizer;
-
-DEFINE_SEAL_MODULE();
-DEFINE_ANOTHER_FWK_MODULE(SiStripClusterizer);
-
-#include "RecoLocalTracker/SiStripClusterizer/plugins/SiStripClusterProducer.h"
-DEFINE_ANOTHER_FWK_MODULE(SiStripClusterProducer);
-=======
 #include "RecoLocalTracker/SiStripClusterizer/plugins/SiStripClusterProducer.h"
 DEFINE_ANOTHER_FWK_MODULE(SiStripClusterProducer);
->>>>>>> 1.2.2.2.2.2