# Conflicts: # android/app/build.gradle # android/build.gradle # android/gradle.properties # android/gradle/wrapper/gradle-wrapper.properties # android/settings.gradle # ios/Runner.xcodeproj/project.pbxproj # lib/api/dashboard_api_client.dart # lib/classes/consts.dart # lib/ui/screens/offers_and_discounts/offers_and_discounts_details.dart # lib/widgets/mark_attendance_widget.dart # pubspec.yaml