Skip to content
  • Takkelapati Abhinaya Chowdary's avatar
    Merge branch 'main' into 'qr-code-feature' · 03b539e9
    Takkelapati Abhinaya Chowdary authored
    # Conflicts:
    #   .gitlab/issue_templates/bug_report.md
    #   .gitlab/issue_templates/ui_feedback.md
    #   Documentation/documentation_assamese.md
    #   Documentation/documentation_bengali.md
    #   Documentation/documentation_bhojpuri.md
    #   Documentation/documentation_english.md
    #   Documentation/documentation_gujarati.md
    #   Documentation/documentation_hindi.md
    #   Documentation/documentation_kannada.md
    #   Documentation/documentation_maithili.md
    #   Documentation/documentation_marathi.md
    #   Documentation/documentation_marwadi.md
    #   Documentation/documentation_odia.md
    #   Documentation/documentation_punjabi.md
    #   Documentation/documentation_sindhi.md
    #   Documentation/documentation_tamil.md
    #   Documentation/documentation_urdu.md
    #   README.md
    #   backend/package-lock.json
    #   backend/package.json
    #   backend/routes/adminSideGeneralRoutes.js
    #   contributing.md
    #   frontend/lib/main.dart
    #   frontend/lib/screens/dashboard/adminModules/patientManagement.dart
    #   frontend/lib/screens/dashboard/dashboard.dart
    #   frontend/lib/screens/dashboard/doctorAssigning.dart
    #   frontend/lib/screens/dashboard/doctorPatientQueues.dart
    #   frontend/lib/screens/dashboard/doctorPrescription.dart
    #   frontend/lib/screens/dashboard/medicinePickup.dart
    #   frontend/lib/screens/dashboard/patientRegistration.dart
    #   frontend/lib/screens/dashboard/vitals.dart
    #   frontend/lib/screens/login/adminLogin.dart
    #   frontend/lib/screens/login/volunteerLogin.dart
    #   frontend/lib/services/api_service.dart
    #   frontend/macos/Flutter/GeneratedPluginRegistrant.swift
    #   frontend/pubspec.lock
    #   frontend/pubspec.yaml
    03b539e9
After you've reviewed these contribution guidelines, you'll be all set to contribute to this project.
Loading