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

Document how to handle config and content conflicts. #305

Merged
merged 1 commit into from
Aug 16, 2016
Merged

Document how to handle config and content conflicts. #305

merged 1 commit into from
Aug 16, 2016

Commits on Aug 16, 2016

  1. Document how to handle config and content conflicts.

    @danepowell
    danepowell committed Aug 16, 2016
    Configuration menu
    Copy the full SHA
    841aa5c View commit details
    Browse the repository at this point in the history