| # Conflicts: # lib/pages/home/home_page.dart # pubspec.lock # pubspec.yaml | ||
|---|---|---|
| .. | ||
| app | ||
| gradle/wrapper | ||
| .gitignore | ||
| build.gradle.kts | ||
| gradle.properties | ||
| settings.gradle.kts | ||
| # Conflicts: # lib/pages/home/home_page.dart # pubspec.lock # pubspec.yaml | ||
|---|---|---|
| .. | ||
| app | ||
| gradle/wrapper | ||
| .gitignore | ||
| build.gradle.kts | ||
| gradle.properties | ||
| settings.gradle.kts | ||