Commit 18ae5fce6693fa5683689ec2f0234e574dc8ea9d
Merge branch 'dev' of http://git3.nong12.com/b2c/gateway into dev
# Conflicts: # mobsite-getway-domain/pom.xml
Showing
1 changed file
with
7 additions
and
1 deletions
mobsite-getway-domain/pom.xml
... | ... | @@ -9,7 +9,6 @@ |
9 | 9 | <version>0.0.1-SNAPSHOT</version> |
10 | 10 | </parent> |
11 | 11 | |
12 | - | |
13 | 12 | <groupId>com.b2c.mobsite</groupId> |
14 | 13 | <artifactId>mobsite-getway-domain</artifactId> |
15 | 14 | <name>mobsite-getway-domain</name> |
... | ... | @@ -18,4 +17,11 @@ |
18 | 17 | <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> |
19 | 18 | </properties> |
20 | 19 | |
20 | + <!--<dependencies> --> | |
21 | + <!--<dependency> --> | |
22 | + <!--<groupId>io.swagger</groupId> --> | |
23 | + <!--<artifactId>swagger-annotations</artifactId> --> | |
24 | + <!--<version>1.5.3</version> --> | |
25 | + <!--</dependency> --> | |
26 | + <!--</dependencies> --> | |
21 | 27 | </project> | ... | ... |