|
@@ -97,16 +97,13 @@
|
|
|
|
|
|
|
|
<module>service-ids</module>
|
|
<module>service-ids</module>
|
|
|
|
|
|
|
|
-<<<<<<< HEAD
|
|
|
|
|
-
|
|
|
|
|
<module>service-cdi</module>
|
|
<module>service-cdi</module>
|
|
|
-=======
|
|
|
|
|
|
|
+
|
|
|
<module>service-ems</module>
|
|
<module>service-ems</module>
|
|
|
|
|
|
|
|
<module>service-transfer</module>
|
|
<module>service-transfer</module>
|
|
|
|
|
|
|
|
<module>service-tsdb</module>
|
|
<module>service-tsdb</module>
|
|
|
->>>>>>> usky-zyj
|
|
|
|
|
|
|
|
|
|
</modules>
|
|
</modules>
|
|
|
|
|
|
