Skip to content

Commit

Permalink
Merge branches 'alibaba' and 'dev' of https://github.com/roncoo/ronco…
Browse files Browse the repository at this point in the history
…o-education into alibaba

� Conflicts:
�	roncoo-education-app-config/pom.xml
�	roncoo-education-app-config/src/main/java/com/roncoo/education/server/config/ServerConfigApplication.java
�	roncoo-education-app-eureka/pom.xml
  • Loading branch information
fengyws committed Sep 6, 2020
2 parents b89b27c + d55b760 commit 37368eb
Showing 1 changed file with 0 additions and 2 deletions.
2 changes: 0 additions & 2 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,6 @@
</developer>
<developer>
<name>yangzj</name>
<email>yangzj@roncoo.com</email>
<organization>LingKe, Co., Ltd.</organization>
<organizationUrl>http://www.roncoo.net</organizationUrl>
<roles>
Expand All @@ -60,7 +59,6 @@
</developer>
<developer>
<name>wuy</name>
<email>wuy@roncoo.com</email>
<organization>LingKe, Co., Ltd.</organization>
<organizationUrl>http://www.roncoo.net</organizationUrl>
<roles>
Expand Down

0 comments on commit 37368eb

Please sign in to comment.