Merge remote-tracking branch 'origin/master'
# Conflicts: # .gitignore # gradlew
This commit is contained in:
auto committed
commit
c7120cc26c
1 file changed
+1
-1
+1
-1
@@ -1,5 +1,5 @@
|
||||
.gradle/
|
||||
.idea/
|
||||
.gradle
|
||||
run
|
||||
build
|
||||
run.sh
|
||||
|
||||
Reference in new issue
Block a user