Fix merge

app/src/main/java/net/pokeranalytics/android/ui/fragment/SettingsFragment.kt

@@ -92,7 +92,7 @@ class SettingsFragment : PokerAnalyticsFragment(), RowRepresentableDelegate, Sta
 	override fun stringForRow(row: RowRepresentable): String {
 		return when (row) {
 			SettingRow.VERSION -> BuildConfig.VERSION_NAME + if (BuildConfig.DEBUG) " (${BuildConfig.VERSION_CODE}) DEBUG" else ""
-			SettingRow.CURRENCY -> Currency.getInstance(Preferences.getCurrencyLocale(this.parentActivity)).symbol
+			SettingRow.CURRENCY -> UserDefaults.currency.symbol
 			else -> ""
 		}
 	}