fixing conflicts

This commit is contained in:
unlnown542a 2018-01-22 01:30:21 +03:00
parent 42d3770b14
commit 347a2c2150
11 changed files with 205 additions and 55 deletions

6
android/.gitignore vendored
View file

@ -5,4 +5,8 @@ ant.properties
local.properties
build.sh
bin
log*
log*
.gradle*
build
assets
gradle-app.setting