Commit d256d569f9fbcd3c3f5f5cfcbf06e007a317b675

Authored by 张宗朋
2 parents e4961fab bda84d7d

Merge

target/m2e-wtp/web-resources/META-INF/MANIFEST.MF
1   -Manifest-Version: 1.0
2   -Build-Jdk: 1.7.0_13
3   -Built-By: Administrator
4   -Created-By: Maven Integration for Eclipse
5   -
  1 +Manifest-Version: 1.0
  2 +Build-Jdk: 1.7.0_13
  3 +Built-By: Administrator
  4 +Created-By: Maven Integration for Eclipse
  5 +
... ...
target/m2e-wtp/web-resources/META-INF/maven/com.cnlive.mz.live.web/cnlive_live_web/pom.properties
1 1 #Generated by Maven Integration for Eclipse
2   -#Sat Aug 20 09:25:14 CST 2016
  2 +#Sat Aug 20 18:14:13 CST 2016
3 3 version=0.0.1-SNAPSHOT
4 4 groupId=com.cnlive.mz.live.web
5 5 m2e.projectName=cnlive_live_web
... ...