Conflicts:
	.gitignore
	target/m2e-wtp/web-resources/META-INF/maven/osc.git.eh3/useful-code/pom.properties
This commit is contained in:
lixiangrong
2016-01-26 16:40:04 +08:00
3 changed files with 1 additions and 28 deletions

3
.gitignore vendored
View File

@@ -3,5 +3,4 @@
# Package Files #
*.jar
*.war
*.ear
/target/
*.ear