e1b774a745
# Conflicts: # android/app/build.gradle |
||
---|---|---|
.. | ||
app | ||
fastlane | ||
gradle/wrapper | ||
Gemfile | ||
Gemfile.lock | ||
build.gradle | ||
gradle.properties | ||
gradlew | ||
gradlew.bat | ||
settings.gradle |
e1b774a745
# Conflicts: # android/app/build.gradle |
||
---|---|---|
.. | ||
app | ||
fastlane | ||
gradle/wrapper | ||
Gemfile | ||
Gemfile.lock | ||
build.gradle | ||
gradle.properties | ||
gradlew | ||
gradlew.bat | ||
settings.gradle |