...
|
...
|
@@ -8,11 +8,8 @@ |
|
|
<version>2.1.7.RELEASE</version>
|
|
|
<relativePath/> <!-- lookup parent from repository -->
|
|
|
</parent>
|
|
|
<<<<<<< HEAD
|
|
|
|
|
|
<groupId>com.sunyo.wlpt.cloud.config.server</groupId>
|
|
|
=======
|
|
|
<groupId>com.sunyo.wlpt.cloud.config.center</groupId>
|
|
|
>>>>>>> 0c7d87d9e2a5f6087f286c23ebe436594b4099c5
|
|
|
<artifactId>cloud-config-server</artifactId>
|
|
|
<version>0.0.1-SNAPSHOT</version>
|
|
|
<name>cloud-config-server</name>
|
...
|
...
|
@@ -121,11 +118,7 @@ |
|
|
<groupId>org.springframework.boot</groupId>
|
|
|
<artifactId>spring-boot-maven-plugin</artifactId>
|
|
|
<configuration>
|
|
|
<<<<<<< HEAD
|
|
|
<mainClass>com.sunyo.wlpt.cloud.config.server.CloudConfigServerApplication</mainClass>
|
|
|
=======
|
|
|
<mainClass>com.sunyo.wlpt.cgonms.provide.CgonmsProvideApplication</mainClass>
|
|
|
>>>>>>> 0c7d87d9e2a5f6087f286c23ebe436594b4099c5
|
|
|
</configuration>
|
|
|
</plugin>
|
|
|
</plugins>
|
...
|
...
|
|