diff --git a/app/build.gradle b/app/build.gradle index 089f300..39c73ec 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -37,7 +37,11 @@ applicationId "nl.digital_me.dummyandroidapp" minSdkVersion 14 targetSdkVersion rootProject.ext.compileSdkVersion +<<<<<<< HEAD versionCode project.hasProperty('versionCode') ? project.property('versionCode') as int : 55 +======= + versionCode project.hasProperty('versionCode') ? project.property('versionCode') as int : 58 +>>>>>>> refs/remotes/origin/master versionName project.hasProperty('versionName') ? project.property('versionName') : "0.0.5" multiDexEnabled true } diff --git a/fastlane/metadata/android/en-US/changelogs/56.txt b/fastlane/metadata/android/en-US/changelogs/56.txt new file mode 100644 index 0000000..cfe3c40 --- /dev/null +++ b/fastlane/metadata/android/en-US/changelogs/56.txt @@ -0,0 +1,2 @@ +- using updated build tools + diff --git a/fastlane/metadata/android/en-US/changelogs/57.txt b/fastlane/metadata/android/en-US/changelogs/57.txt new file mode 100644 index 0000000..cfe3c40 --- /dev/null +++ b/fastlane/metadata/android/en-US/changelogs/57.txt @@ -0,0 +1,2 @@ +- using updated build tools + diff --git a/fastlane/metadata/android/en-US/changelogs/58.txt b/fastlane/metadata/android/en-US/changelogs/58.txt new file mode 100644 index 0000000..cfe3c40 --- /dev/null +++ b/fastlane/metadata/android/en-US/changelogs/58.txt @@ -0,0 +1,2 @@ +- using updated build tools + diff --git a/fastlane/metadata/android/nl-NL/changelogs/56.txt b/fastlane/metadata/android/nl-NL/changelogs/56.txt new file mode 100644 index 0000000..29cb24a --- /dev/null +++ b/fastlane/metadata/android/nl-NL/changelogs/56.txt @@ -0,0 +1 @@ +- gebruik bijgewerkt bouwgereedschappen diff --git a/fastlane/metadata/android/nl-NL/changelogs/57.txt b/fastlane/metadata/android/nl-NL/changelogs/57.txt new file mode 100644 index 0000000..29cb24a --- /dev/null +++ b/fastlane/metadata/android/nl-NL/changelogs/57.txt @@ -0,0 +1 @@ +- gebruik bijgewerkt bouwgereedschappen diff --git a/fastlane/metadata/android/nl-NL/changelogs/58.txt b/fastlane/metadata/android/nl-NL/changelogs/58.txt new file mode 100644 index 0000000..29cb24a --- /dev/null +++ b/fastlane/metadata/android/nl-NL/changelogs/58.txt @@ -0,0 +1 @@ +- gebruik bijgewerkt bouwgereedschappen