resolve conflict

butterflyforever · butterflyforever · commit e99fae913fd7 · 2020-07-25T17:59:50.000-04:00
diff --git a/android/canonical/app/src/main/java/com/google/samples/quickstart/canonical/MapsFragment.kt b/android/canonical/app/src/main/java/com/google/samples/quickstart/canonical/MapsFragment.kt
@@ -51,7 +51,7 @@ class MapsFragment : Fragment() {
         private const val PADDING_RATIO = 1.5
         private const val FRAGMENT_TAG = "Mapfragment"
     }
-
+    
     override fun onRequestPermissionsResult(requestCode: Int,
                                             permissions: Array<String>, grantResults: IntArray) {
         when (requestCode) {

Original file line number	Diff line number	Diff line change
`@@ -51,7 +51,7 @@ class MapsFragment : Fragment() {`
`51`	`51`	`private const val PADDING_RATIO = 1.5`
`52`	`52`	`private const val FRAGMENT_TAG = "Mapfragment"`
`53`	`53`	`}`
`54`		`-`
	`54`	`+`
`55`	`55`	`override fun onRequestPermissionsResult(requestCode: Int,`
`56`	`56`	`permissions: Array<String>, grantResults: IntArray) {`
`57`	`57`	`when (requestCode) {`