Skip to content

O
order-group
Commit 19937706 by 孙昱
Options

sunyu::update::fix conflicts about pom

parent 38672303
Showing with 0 additions and 8 deletions
order-application-service/pom.xml
...@@ -315,20 +315,12 @@ ...@@ -315,20 +315,12 @@
<dependency> <dependency>
<groupId>com.freemud.application.service.sdk</groupId> <groupId>com.freemud.application.service.sdk</groupId>
<artifactId>paymentcenter-sdk</artifactId> <artifactId>paymentcenter-sdk</artifactId>
<<<<<<< HEAD
<version>2.9.RELEASE</version>
=======
<version>2.9.2-SNAPSHOT</version> <version>2.9.2-SNAPSHOT</version>
>>>>>>> 438653b03faf935328d8ce5cd03f13eed5bd8631
</dependency> </dependency>
<dependency> <dependency>
<groupId>com.freemud.sdk.api.assortment</groupId> <groupId>com.freemud.sdk.api.assortment</groupId>
<artifactId>assortment-payment-sdk</artifactId> <artifactId>assortment-payment-sdk</artifactId>
<<<<<<< HEAD
<version>2.6.1.RELEASE</version> <version>2.6.1.RELEASE</version>
=======
<version>2.6.1-SNAPSHOT</version>
>>>>>>> 438653b03faf935328d8ce5cd03f13eed5bd8631
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.apache.rocketmq</groupId> <groupId>org.apache.rocketmq</groupId>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment