Merge branch 'master' of https://github.com/spring-projects/sts4
Conflicts: .gitignore
This commit is contained in:
1
.gitignore
vendored
1
.gitignore
vendored
@@ -1,5 +1,6 @@
|
||||
*.class
|
||||
**/.classpath
|
||||
**/classpath.txt
|
||||
**/.idea
|
||||
**/*.iml
|
||||
|
||||
|
||||
Reference in New Issue
Block a user