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

[AUTO-MERGE] Merge main into develop via merge-main-to-develop #14

Merged
merged 3 commits into from
Jan 15, 2024
Merged

[AUTO-MERGE] Merge main into develop via merge-main-to-develop #14

merged 3 commits into from
Jan 15, 2024

Commits on Jan 15, 2024

  1. Try creating conflict 

    Signed-off-by: Ankita Katiyar <[email protected]>
    @ankatiyar
    ankatiyar committed Jan 15, 2024
    Configuration menu
    Copy the full SHA
    e0706d2 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'develop' into merge-main-to-develop

    @ankatiyar
    ankatiyar committed Jan 15, 2024
    Configuration menu
    Copy the full SHA
    b2ab812 View commit details
    Browse the repository at this point in the history

  3. Fix lint 

    Signed-off-by: Ankita Katiyar <[email protected]>
    @ankatiyar
    ankatiyar committed Jan 15, 2024
    Configuration menu
    Copy the full SHA
    71af1f9 View commit details
    Browse the repository at this point in the history