Skip to content
Snippets Groups Projects

Resolve "Show conflicts in grid"

Merged Resolve "Show conflicts in grid"
11-show-conflicts-in-grid into master
Merged
Benoît Harraultrequested to merge
11-show-conflicts-in-grid into master
Compare
and
9 files
+ 128
− 30
Compare changes
  • Side-by-side
  • Inline

Files

android/gradle.properties
+ 2
− 2
org.gradle.jvmargs=-Xmx1536M
org.gradle.jvmargs=-Xmx1536M
android.useAndroidX=true
android.useAndroidX=true
android.enableJetifier=true
android.enableJetifier=true
app.versionName=0.0.12
app.versionName=0.0.13
app.versionCode=12
app.versionCode=13