|  | @@ -8,7 +8,11 @@ |  | @@ -8,7 +8,11 @@ | 
| 8 | <version>2.1.7.RELEASE</version> | 8 | <version>2.1.7.RELEASE</version> | 
| 9 | <relativePath/> <!-- lookup parent from repository --> | 9 | <relativePath/> <!-- lookup parent from repository --> | 
| 10 | </parent> | 10 | </parent> | 
|  |  | 11 | +<<<<<<< HEAD | 
| 11 | <groupId>com.sunyo.wlpt.cloud.config.server</groupId> | 12 | <groupId>com.sunyo.wlpt.cloud.config.server</groupId> | 
|  |  | 13 | +======= | 
|  |  | 14 | +	<groupId>com.sunyo.wlpt.cloud.config.center</groupId> | 
|  |  | 15 | +>>>>>>> 0c7d87d9e2a5f6087f286c23ebe436594b4099c5 | 
| 12 | <artifactId>cloud-config-server</artifactId> | 16 | <artifactId>cloud-config-server</artifactId> | 
| 13 | <version>0.0.1-SNAPSHOT</version> | 17 | <version>0.0.1-SNAPSHOT</version> | 
| 14 | <name>cloud-config-server</name> | 18 | <name>cloud-config-server</name> | 
|  | @@ -117,7 +121,11 @@ |  | @@ -117,7 +121,11 @@ | 
| 117 | <groupId>org.springframework.boot</groupId> | 121 | <groupId>org.springframework.boot</groupId> | 
| 118 | <artifactId>spring-boot-maven-plugin</artifactId> | 122 | <artifactId>spring-boot-maven-plugin</artifactId> | 
| 119 | <configuration> | 123 | <configuration> | 
|  |  | 124 | +<<<<<<< HEAD | 
| 120 | <mainClass>com.sunyo.wlpt.cloud.config.server.CloudConfigServerApplication</mainClass> | 125 | <mainClass>com.sunyo.wlpt.cloud.config.server.CloudConfigServerApplication</mainClass> | 
|  |  | 126 | +======= | 
|  |  | 127 | +                    <mainClass>com.sunyo.wlpt.cgonms.provide.CgonmsProvideApplication</mainClass> | 
|  |  | 128 | +>>>>>>> 0c7d87d9e2a5f6087f286c23ebe436594b4099c5 | 
| 121 | </configuration> | 129 | </configuration> | 
| 122 | </plugin> | 130 | </plugin> | 
| 123 | </plugins> | 131 | </plugins> |