Fix rebase conflicts

MozillaReality · Mar 17, 2020 · 0ffaa69 · 0ffaa69
1 parent 99fd909
commit 0ffaa69
Showing 1 changed file with 7 additions and 6 deletions.
diff --git a/app/build.gradle b/app/build.gradle
@@ -559,15 +559,11 @@ if (gradle.hasProperty('localProperties.dependencySubstitutions.geckoviewTopsrcd
     apply from: "${topsrcdir}/substitute-local-geckoview.gradle"
 }
 
-android.applicationVariants.all { variant ->
 // -------------------------------------------------------------------------------------------------
-//  Dynamically set versionCode (See tools/build/versionCode.gradle
+// MLS: Read token from local file if it exists
 // -------------------------------------------------------------------------------------------------
 
-    // -------------------------------------------------------------------------------------------------
-    // MLS: Read token from local file if it exists
-    // -------------------------------------------------------------------------------------------------
-
+android.applicationVariants.all { variant ->
     print("MLS token: ")
 
     try {
@@ -580,6 +576,11 @@ android.applicationVariants.all { variant ->
     }
 
 }
+
+// -------------------------------------------------------------------------------------------------
+//  Dynamically set versionCode (See tools/build/versionCode.gradle
+// -------------------------------------------------------------------------------------------------
+
 android.applicationVariants.all { variant ->
     if (gradle.hasProperty('userProperties.taskclusterBuild')) {
         variant.outputs.each { output ->