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

2nd PR #9

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

2nd PR #9

wants to merge 2 commits into from

Commits on Feb 2, 2018

  1. Merge branch 'master' of https://github.com/MissionBit/dragons

    @ggorlen
    ggorlen committed Feb 2, 2018
    Configuration menu
    Copy the full SHA
    ba4e1cd View commit details
    Browse the repository at this point in the history

  2. testing merge conflict

    @ggorlen
    ggorlen committed Feb 2, 2018
    Configuration menu
    Copy the full SHA
    6c00e15 View commit details
    Browse the repository at this point in the history