Skip to content
Snippets Groups Projects
Commit 9a4b4744 authored by myliu@ihep.ac.cn's avatar myliu@ihep.ac.cn
Browse files

Resolve conflicts

parent c71bd59a
No related branches found
No related tags found
No related merge requests found
......@@ -31,7 +31,7 @@
<include ref="../CRD_common_v01/VXD_v01_01.xml"/>
<include ref="../CRD_common_v01/FTD_SkewRing_v01_01.xml"/>
<include ref="../CRD_common_v01/SIT_SimplePixel_v01_01.xml"/>
<include ref="../CRD_common_v01/DC_Simple_v01_03.xml"/>
<include ref="../CRD_common_v01/DC_Simple_v01_02.xml"/>
<include ref="../CRD_common_v01/SET_SimplePlanar_v01_01.xml"/>
<fields>
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment