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

Fixing issues introduced by a previous merge conflict #30

Merged
merged 4 commits into from
Apr 24, 2023
Merged

Fixing issues introduced by a previous merge conflict #30

merged 4 commits into from
Apr 24, 2023

Commits on Apr 13, 2023

  1. Merge pull request #24 from NetAppDocs/apr-2023-digital-wallet 

    Added the digital wallet
    @netapp-bcammett
    netapp-bcammett committed Apr 13, 2023
    Configuration menu
    Copy the full SHA
    432a035 View commit details
    Browse the repository at this point in the history

Commits on Apr 21, 2023

  1. Merge branch 'main' into rebranding

    @netapp-bcammett
    netapp-bcammett committed Apr 21, 2023
    Configuration menu
    Copy the full SHA
    d341568 View commit details
    Browse the repository at this point in the history

  2. Merge pull request #25 from NetAppDocs/rebranding 

    BlueXP terminology updates
    @netapp-bcammett
    netapp-bcammett committed Apr 21, 2023
    Configuration menu
    Copy the full SHA
    9ec2b87 View commit details
    Browse the repository at this point in the history

Commits on Apr 24, 2023

  1. Merge branch 'main' into bad-merge

    @netapp-bcammett
    netapp-bcammett committed Apr 24, 2023
    Configuration menu
    Copy the full SHA
    57dc9a2 View commit details
    Browse the repository at this point in the history