Resolve faulty version conflict
commit f8a6ea10afce36e7c7c6311b42eb99b7fbd2f2a0
2 parents c579920 + e5707a8
@Benoit Donneaux Benoit Donneaux authored on 17 Mar 2018
Showing 15 changed files
View
.gitignore
View
.idea/compiler.xml 100644 → 0
View
.idea/copyright/profiles_settings.xml 100644 → 0
View
.idea/encodings.xml 100644 → 0
View
.idea/gradle.xml 100644 → 0
View
.idea/misc.xml 100644 → 0
View
.idea/modules.xml 100644 → 0
View
.idea/runConfigurations.xml 100644 → 0
View
.idea/vcs.xml 100644 → 0
View
DummyAndroidApp.iml 100644 → 0
View
Jenkinsfile 0 → 100644
View
app/app.iml 100644 → 0
View
app/build.gradle
View
build.gradle
View
fastlane/Fastfile