Merge branch 'master' of https://git.oschina.net/eh3/useful-code
Conflicts: .gitignore target/m2e-wtp/web-resources/META-INF/maven/osc.git.eh3/useful-code/pom.properties
This commit is contained in:
3
.gitignore
vendored
3
.gitignore
vendored
@@ -3,5 +3,4 @@
|
||||
# Package Files #
|
||||
*.jar
|
||||
*.war
|
||||
*.ear
|
||||
/target/
|
||||
*.ear
|
Reference in New Issue
Block a user