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

Resolve conflicts on next branch #1923

Merged
merged 3 commits into from
Mar 19, 2018
Merged

Resolve conflicts on next branch #1923

merged 3 commits into from
Mar 19, 2018

Commits on Mar 19, 2018

  1. Update gitignore

    @dhruvdutt
    dhruvdutt committed Mar 19, 2018
    Configuration menu
    Copy the full SHA
    388bec7 View commit details
    Browse the repository at this point in the history

  2. Resolve conflicts

    @dhruvdutt
    dhruvdutt committed Mar 19, 2018
    Configuration menu
    Copy the full SHA
    8b4123d View commit details
    Browse the repository at this point in the history

  3. Resolve conflicts

    @dhruvdutt
    dhruvdutt committed Mar 19, 2018
    Configuration menu
    Copy the full SHA
    1d51de8 View commit details
    Browse the repository at this point in the history