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

merged and resolved conflicy

Browse source
This commit is contained in:
William Jordan-Cooley 2024-06-25 15:33:30 -04:00
parent a9ee9061b3
commit 22af3d096a
1 changed files with 0 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
lib/pangea/widgets/practice_activity/practice_activity_card.dart
View file

@ -50,7 +50,6 @@ class MessagePracticeActivityCardState extends State<PracticeActivityCard> {
return langCode;
}
<<<<<<< Updated upstream
void loadInitialData() {
if (langCode == null) return;
updatePracticeActivity();
@ -76,11 +75,6 @@ class MessagePracticeActivityCardState extends State<PracticeActivityCard> {
else if (activities.isNotEmpty) {
practiceEvent = activities.last;
}
=======
practiceEvent =
widget.pangeaMessageEvent.practiceActivities(langCode).firstOrNull;
>>>>>>> Stashed changes
setState(() {});
}