Resolved conflicts

app/src/main/java/chat/rocket/android/settings/ui/SettingsFragment.kt

@@ -82,7 +82,7 @@ class SettingsFragment : Fragment(), SettingsView {
         text_share_this_app.setOnClickListener { shareApp() }
 
         text_license.setOnClickListener {
-            presenter.toLicense(getString(R.string.license_url), getString(R.string.title_licence))
+            presenter.toLicense(getString(R.string.license_url), getString(R.string.title_license))
         }
 
         text_app_version.text = getString(R.string.msg_app_version, BuildConfig.VERSION_NAME, BuildConfig.VERSION_CODE)

app/src/main/res/layout/fragment_settings.xml

@@ -183,7 +183,7 @@
                 android:paddingTop="8dp"
                 android:paddingEnd="16dp"
                 android:paddingBottom="8dp"
-                android:text="@string/msg_licence"
+                android:text="@string/msg_license"
                 android:textColor="#DE000000"
                 android:textSize="16sp"
                 android:textStyle="normal"