resolved conflicts
This commit is contained in:
5
.gitignore
vendored
5
.gitignore
vendored
@@ -4,6 +4,9 @@ target/
|
||||
!**/src/main/**/target/
|
||||
!**/src/test/**/target/
|
||||
.DS_Store
|
||||
*/.DS_Store
|
||||
**/.DS_Store
|
||||
|
||||
### STS ###
|
||||
.apt_generated
|
||||
.classpath
|
||||
@@ -35,3 +38,5 @@ build/
|
||||
|
||||
### VS Code ###
|
||||
.vscode/
|
||||
|
||||
|
||||
|
||||
Reference in New Issue
Block a user