Skip to content

Commit

Permalink
Merge pull request #815 from HelloCoCooo/master
Browse files Browse the repository at this point in the history
Fix the dependency conflict issue
  • Loading branch information
rayzhang0603 authored Apr 12, 2019
2 parents 1e8d524 + 42eb11a commit 7250ad7
Showing 1 changed file with 3 additions and 3 deletions.
6 changes: 3 additions & 3 deletions motan-benchmark/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -50,12 +50,12 @@
</dependency>
<dependency>
<groupId>com.weibo</groupId>
<artifactId>motan-transport-netty</artifactId>
<artifactId>motan-registry-zookeeper</artifactId>
<version>${project.parent.version}</version>
</dependency>
<dependency>
<groupId>com.weibo</groupId>
<artifactId>motan-registry-zookeeper</artifactId>
<artifactId>motan-transport-netty</artifactId>
<version>${project.parent.version}</version>
</dependency>
<dependency>
Expand Down Expand Up @@ -93,4 +93,4 @@
</build>


</project>
</project>

0 comments on commit 7250ad7

Please sign in to comment.