Merge remote-tracking branch 'origin/master'
# Conflicts: # .gitignore # gradlew
This commit is contained in:
commit
c7120cc26c
2
.gitignore
vendored
2
.gitignore
vendored
|
|
@ -1,5 +1,5 @@
|
|||
.gradle/
|
||||
.idea/
|
||||
.gradle
|
||||
run
|
||||
build
|
||||
run.sh
|
||||
|
|
|
|||
Loading…
Reference in New Issue
Block a user