更新 ignore
This commit is contained in:
parent
2f9401dcfd
commit
b147f5f7ae
3
.gitignore
vendored
3
.gitignore
vendored
@ -1,5 +1,4 @@
|
|||||||
.DS_Store
|
.DS_Store
|
||||||
<<<<<<< HEAD
|
|
||||||
|
|
||||||
# idea
|
# idea
|
||||||
code/.idea
|
code/.idea
|
||||||
@ -15,6 +14,4 @@ code/out
|
|||||||
# gradle
|
# gradle
|
||||||
code/.gradle
|
code/.gradle
|
||||||
!code/gradle/wrapper/gradle-wrapper.jar
|
!code/gradle/wrapper/gradle-wrapper.jar
|
||||||
=======
|
|
||||||
*.txt
|
*.txt
|
||||||
>>>>>>> 4770ba68eceb376456a49d8e08f5e74780bbda20
|
|
||||||
|
Loading…
x
Reference in New Issue
Block a user