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

Merging experiments #1

Merged
merged 5 commits into from
Jul 7, 2021
Merged

Merging experiments #1

merged 5 commits into from
Jul 7, 2021

Commits on Mar 28, 2015

  1. merging wth master

    @NataliaLKB
    NataliaLKB committed Mar 28, 2015
    Configuration menu
    Copy the full SHA
    9a080d7 View commit details
    Browse the repository at this point in the history

Commits on Mar 31, 2015

  1. Changing cheatsheet.md title

    @NataliaLKB
    NataliaLKB committed Mar 31, 2015
    Configuration menu
    Copy the full SHA
    e0ee009 View commit details
    Browse the repository at this point in the history

  2. reverting back cheatsheet to try to create merge conflicts

    @NataliaLKB
    NataliaLKB committed Mar 31, 2015
    Configuration menu
    Copy the full SHA
    7780e4a View commit details
    Browse the repository at this point in the history

  3. merging remote with local branch

    @NataliaLKB
    NataliaLKB committed Mar 31, 2015
    Configuration menu
    Copy the full SHA
    de57652 View commit details
    Browse the repository at this point in the history

Commits on Jul 7, 2021

  1. resolve conflicts

    m_banaszynski authored and m_banaszynski committed Jul 7, 2021
    Configuration menu
    Copy the full SHA
    70440b3 View commit details
    Browse the repository at this point in the history