ember/fluffychat
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix(phonetic_transcription): fixing a merge conflict

Browse source
This commit is contained in:
wcjord 2025-06-20 09:31:14 -04:00
parent a396b94bec
commit 4fdf1f970b
1 changed files with 0 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
lib/pangea/learning_settings/controllers/language_controller.dart
View file

@ -113,12 +113,6 @@ class LanguageController {
}
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.userL2 != null &&
_pangeaController.languageController.userL1?.script !=
@ -127,5 +121,4 @@ class LanguageController {
LanguageKeys.unknownLanguage ||
_pangeaController.languageController.userL2?.script ==
LanguageKeys.unknownLanguage);
>>>>>>> Stashed changes
}