dev_sultan

Conversation 0 Commits 8 Files Changed 38

khansultan1 commented

Collaborator

There is no content yet.

khansultan1 added 8 commits

ac17202b7a search lab order updated.

7919d40f65 Merge branch 'master' of http://34.17.52.180/Haroon6138/HMG_Patient_App_New into dev_sultan

# Conflicts:
#	lib/presentation/insurance/insurance_home_page.dart

52fddc5323 login flow completion

4e1912048d login flow completion

61d10068ca Merge branch 'dev_aamir' of http://34.17.52.180/Haroon6138/HMG_Patient_App_New into dev_sultan

ba2c8327fe login flow inprogress

384ac814f8 Merge branch 'master' of http://34.17.52.180/Haroon6138/HMG_Patient_App_New into dev_sultan

# Conflicts:
#	lib/core/app_assets.dart
#	lib/core/dependencies.dart
#	lib/presentation/lab/lab_orders_page.dart
#	lib/widgets/common_bottom_sheet.dart

7d5b941df3 merged conflict

Haroon6138 merged commit 30d3751052 into master 2 months ago

Haroon6138 referenced this issue from a commit

Merge pull request 'dev_sultan' (#14) from dev_sultan into master

The pull request has been merged as 30d3751052.

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 dev_sultan master

git pull origin dev_sultan

Step 2:

Merge the changes and update on Gitea.

git checkout master

git merge --no-ff dev_sultan

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.

Loading…

There is no content yet.

Labels Milestones

dev_sultan #14

Step 1:

Step 2: