更新 upstream
This commit is contained in:
6
.gitignore
vendored
6
.gitignore
vendored
@ -1,4 +1,5 @@
|
||||
.DS_Store
|
||||
<<<<<<< HEAD
|
||||
|
||||
# idea
|
||||
code/.idea
|
||||
@ -13,4 +14,7 @@ code/out
|
||||
|
||||
# gradle
|
||||
code/.gradle
|
||||
!code/gradle/wrapper/gradle-wrapper.jar
|
||||
!code/gradle/wrapper/gradle-wrapper.jar
|
||||
=======
|
||||
*.txt
|
||||
>>>>>>> 4770ba68eceb376456a49d8e08f5e74780bbda20
|
||||
|
Reference in New Issue
Block a user