Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Resolved conflicts for previously raised PR #220

Open
wants to merge 5 commits into
base: QA-2857-automation-formplayer-tests-automation
Choose a base branch
from
Open

Resolved conflicts for previously raised PR #220

wants to merge 5 commits into from

Commits on Apr 25, 2023

  1. Merge branch 'QA-2857-automation-formplayer-tests-automation' of http… 

    …s://github.com/dimagi/dimagi-qa into ns/formplayer_cherry_pick
    @nsaxena03
    nsaxena03 committed Apr 25, 2023
    Configuration menu
    Copy the full SHA
    3b166c0 View commit details
    Browse the repository at this point in the history

  2. resolving conflicts

    @nsaxena03
    nsaxena03 committed Apr 25, 2023
    Configuration menu
    Copy the full SHA
    98a011d View commit details
    Browse the repository at this point in the history

  3. Merge remote-tracking branch 'origin' into ns/formplayer_cherry_pick

    @nsaxena03
    nsaxena03 committed Apr 25, 2023
    Configuration menu
    Copy the full SHA
    7c20728 View commit details
    Browse the repository at this point in the history

  4. Merge remote-tracking branch 'origin/QA-2857-automation-formplayer-te… 

    …sts-automation' into ns/formplayer_cherry_pick
    @nsaxena03
    nsaxena03 committed Apr 25, 2023
    Configuration menu
    Copy the full SHA
    b355d7f View commit details
    Browse the repository at this point in the history

  5. changes to run workflows manually

    @nsaxena03
    nsaxena03 committed Apr 25, 2023
    Configuration menu
    Copy the full SHA
    574dcc7 View commit details
    Browse the repository at this point in the history