# Conflicts: # mobile/lib/screens/conversation_list_screen.dart # mobile/pubspec.lock |
||
|---|---|---|
| .. | ||
| db | ||
| models | ||
| screens | ||
| services | ||
| state | ||
| theme | ||
| widgets | ||
| config.dart | ||
| main.dart | ||
# Conflicts: # mobile/lib/screens/conversation_list_screen.dart # mobile/pubspec.lock |
||
|---|---|---|
| .. | ||
| db | ||
| models | ||
| screens | ||
| services | ||
| state | ||
| theme | ||
| widgets | ||
| config.dart | ||
| main.dart | ||