Skip to content

C
cat

梦中观雨 / cat
与 Fork 源项目一致

从无法访问的项目Fork

通知 1
Star 0
Fork 0
C
cat

体验新版 GitCode，发现更多精彩内容 >>

提交 b3361309 编写于 作者: J jialinsun
浏览文件
操作

resolve conflicts

上级 5d844fad
显示空白变更内容
内联 并排
Showing with 34 addition and 3 deletion
cat-core/src/main/resources/META-INF/plexus/components.xml
浏览文件 @ b3361309
...@@ -93,12 +93,9 @@ ...@@ -93,12 +93,9 @@
<implementation>com.dianping.cat.config.app.AppDataService</implementation> <implementation>com.dianping.cat.config.app.AppDataService</implementation>
<requirements> <requirements>
<requirement> <requirement>
<<<<<<< HEAD
<role>com.dianping.cat.config.app.AppConfigManager</role> <role>com.dianping.cat.config.app.AppConfigManager</role>
</requirement> </requirement>
<requirement> <requirement>
=======
>>>>>>> ef246debc1b669c9971ec18931bbb4b5eb393249
<role>com.dianping.cat.app.AppDataCommandDao</role> <role>com.dianping.cat.app.AppDataCommandDao</role>
</requirement> </requirement>
</requirements> </requirements>
......
cat-home/src/main/resources/META-INF/plexus/components.xml
浏览文件 @ b3361309
...@@ -3744,6 +3744,23 @@ ...@@ -3744,6 +3744,23 @@
<component> <component>
<role>com.dianping.cat.config.app.AppDataService</role> <role>com.dianping.cat.config.app.AppDataService</role>
<implementation>com.dianping.cat.config.app.AppDataService</implementation> <implementation>com.dianping.cat.config.app.AppDataService</implementation>
<requirements>
<requirement>
<role>com.dianping.cat.app.AppDataCommandDao</role>
</requirement>
<requirement>
<role>com.dianping.cat.config.app.AppConfigManager</role>
</requirement>
</requirements>
</component>
<component>
<role>com.dianping.cat.app.AppDataCommandDao</role>
<implementation>com.dianping.cat.app.AppDataCommandDao</implementation>
<requirements>
<requirement>
<role>org.unidal.dal.jdbc.QueryEngine</role>
</requirement>
</requirements>
</component> </component>
<component> <component>
<role>com.dianping.cat.system.SystemModule</role> <role>com.dianping.cat.system.SystemModule</role>
...@@ -7413,6 +7430,23 @@ ...@@ -7413,6 +7430,23 @@
<component> <component>
<role>com.dianping.cat.config.app.AppDataService</role> <role>com.dianping.cat.config.app.AppDataService</role>
<implementation>com.dianping.cat.config.app.AppDataService</implementation> <implementation>com.dianping.cat.config.app.AppDataService</implementation>
<requirements>
<requirement>
<role>com.dianping.cat.app.AppDataCommandDao</role>
</requirement>
<requirement>
<role>com.dianping.cat.config.app.AppConfigManager</role>
</requirement>
</requirements>
</component>
<component>
<role>com.dianping.cat.app.AppDataCommandDao</role>
<implementation>com.dianping.cat.app.AppDataCommandDao</implementation>
<requirements>
<requirement>
<role>org.unidal.dal.jdbc.QueryEngine</role>
</requirement>
</requirements>
</component> </component>
<component> <component>
<role>com.dianping.cat.system.SystemModule</role> <role>com.dianping.cat.system.SystemModule</role>
......
Markdown is supported
0% 或 .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑！
想要评论请 注册 或