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

Resolving merge conflicts #1

Merged
merged 9 commits into from
May 24, 2024
Merged

Resolving merge conflicts #1

merged 9 commits into from
May 24, 2024

Commits on May 24, 2024

  1. Update resume.md in my-resume

    @github-actions
    github-actions[bot] committed May 24, 2024
    Configuration menu
    Copy the full SHA
    348c26b View commit details
    Browse the repository at this point in the history

  2. Update to 1 in STEP and README.md

    @github-actions
    github-actions[bot] committed May 24, 2024
    Configuration menu
    Copy the full SHA
    991f62d View commit details
    Browse the repository at this point in the history

  3. Update step in my-resume

    @github-actions
    github-actions[bot] committed May 24, 2024
    Configuration menu
    Copy the full SHA
    8348666 View commit details
    Browse the repository at this point in the history

  4. Update to 2 in STEP and README.md

    @github-actions
    github-actions[bot] committed May 24, 2024
    Configuration menu
    Copy the full SHA
    24d5b22 View commit details
    Browse the repository at this point in the history

  5. Merge branch 'main' into my-resume

    @draman42
    draman42 authored May 24, 2024
    Configuration menu
    Copy the full SHA
    028e74b View commit details
    Browse the repository at this point in the history

  6. Update to 3 in STEP and README.md

    @github-actions
    github-actions[bot] committed May 24, 2024
    Configuration menu
    Copy the full SHA
    a1ffd8a View commit details
    Browse the repository at this point in the history

  7. Create references.md

    @draman42
    draman42 authored May 24, 2024
    Configuration menu
    Copy the full SHA
    a1d39fb View commit details
    Browse the repository at this point in the history

  8. Update to 4 in STEP and README.md

    @github-actions
    github-actions[bot] committed May 24, 2024
    Configuration menu
    Copy the full SHA
    0bff151 View commit details
    Browse the repository at this point in the history

  9. Merge branch 'main' into my-resume

    @draman42
    draman42 authored May 24, 2024
    Configuration menu
    Copy the full SHA
    d69da1b View commit details
    Browse the repository at this point in the history