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

fixes conflict between next and master after PR1693 merge #1751

Merged
merged 2 commits into from
Aug 25, 2017
Merged

fixes conflict between next and master after PR1693 merge #1751

merged 2 commits into from
Aug 25, 2017

Commits on Aug 25, 2017

  1. fixes conflict between next and master after PR1693 merge 

    [BFB] - Bit-For-Bit
    Aaron Donahue committed Aug 25, 2017
    Configuration menu
    Copy the full SHA
    b9b4484 View commit details
    Browse the repository at this point in the history

  2. fix whitespace diff in namelist_defaults_clm4_5.xml 

    [BFB] - Bit-For-Bit
    Aaron Donahue committed Aug 25, 2017
    Configuration menu
    Copy the full SHA
    1349d06 View commit details
    Browse the repository at this point in the history