You cannot select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
HMG_Patient_App_New/lib
tahaalam 151fcf23d1 Merge remote-tracking branch 'origin/master' into watch_integration
# Conflicts:
#	android/app/build.gradle.kts
#	android/app/src/main/res/mipmap-hdpi/ic_launcher.png
#	android/app/src/main/res/mipmap-mdpi/ic_launcher.png
#	android/app/src/main/res/mipmap-xhdpi/ic_launcher.png
#	android/app/src/main/res/mipmap-xxhdpi/ic_launcher.png
#	android/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png
#	android/app/src/main2/res/mipmap-hdpi/ic_launcher.png
#	android/app/src/main2/res/mipmap-mdpi/ic_launcher.png
#	android/app/src/main2/res/mipmap-xhdpi/ic_launcher.png
#	android/app/src/main2/res/mipmap-xxhdpi/ic_launcher.png
#	android/app/src/main2/res/mipmap-xxxhdpi/ic_launcher.png
#	android/build/reports/problems/problems-report.html
#	assets/langs/ar-SA.json
#	assets/langs/en-US.json
#	lib/generated/locale_keys.g.dart
#	lib/theme/colors.dart
#	package/device_calendar_plus/example/android/app/src/main/res/mipmap-hdpi/ic_launcher.png
#	package/device_calendar_plus/example/android/app/src/main/res/mipmap-mdpi/ic_launcher.png
#	package/device_calendar_plus/example/android/app/src/main/res/mipmap-xhdpi/ic_launcher.png
#	package/device_calendar_plus/example/android/app/src/main/res/mipmap-xxhdpi/ic_launcher.png
#	package/device_calendar_plus/example/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png
#	pubspec.yaml
2 weeks ago
..
core Merge remote-tracking branch 'origin/master' into watch_integration 2 weeks ago
extensions Merge remote-tracking branch 'origin/master' into watch_integration 2 weeks ago
features Merge remote-tracking branch 'origin/master' into watch_integration 2 weeks ago
generated Merge remote-tracking branch 'origin/master' into watch_integration 2 weeks ago
presentation Merge remote-tracking branch 'origin/master' into watch_integration 2 weeks ago
routes Merge remote-tracking branch 'origin/master' into watch_integration 2 weeks ago
services updates 3 weeks ago
theme Merge remote-tracking branch 'origin/master' into watch_integration 2 weeks ago
widgets Merge remote-tracking branch 'origin/master' into watch_integration 2 weeks ago
firebase_options.dart Android package name updated to new package details 1 month ago
main.dart Dark mode persistence added in the app 3 weeks ago
splashPage.dart Merge remote-tracking branch 'origin/master' into watch_integration 2 weeks ago