From 45749f6aa1423c0c003df219719555151efe97aa Mon Sep 17 00:00:00 2001 From: Burt Betchart Date: Tue, 17 Mar 2009 15:44:21 +0000 Subject: [PATCH] --- yaml --- r: 62198 b: refs/heads/l1tmuon-upgrade-dev c: 197cc2d93e72313a705db9facd7f10c274925da3 h: refs/heads/l1tmuon-upgrade-dev --- [refs] | 2 +- .../SiStripClusterizer/plugins/SealModules.cc | 10 ---------- 2 files changed, 1 insertion(+), 11 deletions(-) diff --git a/[refs] b/[refs] index 46dbe6bdf625e..15a6833caa58c 100644 --- 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 index 96100eba8d941..30bb9e660dacc 100644 --- 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