Fixed merge conflict, part 2.

cms-sw · Sep 14, 2020 · a1cb064 · a1cb064
1 parent 310bf13
commit a1cb064
Show file tree

Hide file tree

Showing 2 changed files with 0 additions and 2 deletions.
diff --git a/RecoPPS/Local/BuildFile.xml b/RecoPPS/Local/BuildFile.xml
@@ -6,7 +6,6 @@
 <use name="Geometry/VeryForwardGeometryBuilder"/>
 <use name="Geometry/VeryForwardGeometry"/>
 <use name="Geometry/VeryForwardRPTopology"/>
-<use name="CondFormats/DataRecord"/>
 <use name="CondFormats/PPSObjects"/>
 <use name="DataFormats/CTPPSDetId"/>
 <use name="CommonTools/Utils"/>

diff --git a/SimPPS/RPDigiProducer/plugins/BuildFile.xml b/SimPPS/RPDigiProducer/plugins/BuildFile.xml
@@ -1,4 +1,3 @@
-<use name="CondFormats/DataRecord"/>
 <use name="SimTracker/Common"/>
 <use name="DataFormats/CTPPSDetId"/>
 <use name="CondFormats/DataRecord"/>