fix(phonetic_transcription): fixing a merge conflict

pull/2245/head
wcjord 5 months ago
parent a396b94bec
commit 4fdf1f970b

@ -113,12 +113,6 @@ class LanguageController {
} }
bool get showTrancription => bool get showTrancription =>
<<<<<<< Updated upstream
_pangeaController.languageController.userL1 != null &&
_pangeaController.languageController.userL2 != null &&
_pangeaController.languageController.userL1?.script !=
_pangeaController.languageController.userL2?.script;
=======
(_pangeaController.languageController.userL1 != null && (_pangeaController.languageController.userL1 != null &&
_pangeaController.languageController.userL2 != null && _pangeaController.languageController.userL2 != null &&
_pangeaController.languageController.userL1?.script != _pangeaController.languageController.userL1?.script !=
@ -127,5 +121,4 @@ class LanguageController {
LanguageKeys.unknownLanguage || LanguageKeys.unknownLanguage ||
_pangeaController.languageController.userL2?.script == _pangeaController.languageController.userL2?.script ==
LanguageKeys.unknownLanguage); LanguageKeys.unknownLanguage);
>>>>>>> Stashed changes
} }

Loading…
Cancel
Save