Refund CR Complete with Demop (faiz_dev) #335

Open
FaizHashmiCS22 wants to merge 12 commits from faiz_dev into master
Collaborator
There is no content yet.
FaizHashmiCS22 added 11 commits 6 days ago
42aad44cd4 Merge branch 'refs/heads/master' into faiz_dev
# Conflicts:
#	assets/langs/ar-SA.json
#	assets/langs/en-US.json
#	lib/core/api/api_client.dart
#	lib/core/api_consts.dart
#	lib/generated/locale_keys.g.dart
#	lib/presentation/habib_wallet/habib_wallet_page.dart
#	lib/presentation/my_invoices/widgets/invoice_list_card.dart
#	lib/widgets/image_picker.dart
864b19d166 Merge branch 'master' into faiz_dev
# Conflicts:
#	lib/core/api/api_client.dart
FaizHashmiCS22 added 1 commit 6 days ago
6bb04401cf Merge branch 'master' into faiz_dev
# Conflicts:
#	lib/core/api/api_client.dart
This pull request has changes conflicting with the target branch.
  • lib/core/api/api_client.dart
  • lib/generated/locale_keys.g.dart
You can also view command line instructions.

Step 1:

From your project repository, check out a new branch and test the changes.
git checkout -b faiz_dev master
git pull origin faiz_dev

Step 2:

Merge the changes and update on Gitea.
git checkout master
git merge --no-ff faiz_dev
git push origin master
Sign in to join this conversation.
No reviewers
No Label
No Milestone
No project
No Assignees
1 Participants
Notifications
Due Date
The due date is invalid or out of range. Please use the format 'yyyy-mm-dd'.

No due date set.

Dependencies

No dependencies set.

Reference: Haroon6138/HMG_Patient_App_New#335
Loading…
There is no content yet.