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.

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

Sankey5 #1407

Closed
wants to merge 7 commits into from
Closed

Sankey5 #1407

wants to merge 7 commits into from

Conversation

kdavies4
Copy link
Contributor

This change turns out to be mostly cosmetic--better line-wrapping and plot margins in a demo. It does however fix one problem where the string labels were being appended on successful calls to add subdiagrams.

@dmcdougall
Copy link
Member

@kdavies4 You need to rebase against current upstream/master, not origin/master. origin is the remote that points to your github fork. upstream points to the main codebase.

git fetch upstream
git checkout sankey5
git rebase upstream/master

@dmcdougall
Copy link
Member

Most of these changes address PEP8 issues. Commit f1f949b is the only one the contains non-PEP8 changes.

@kdavies4
Copy link
Contributor Author

I think I made a mess of my local copy when I was trying to rebase. Can you work with what is here?

@dmcdougall
Copy link
Member

I feel #1574 supersedes this. As a result I'm closing this ticket. @kdavies4 If I am mistaken, please feel free to reopen.

@dmcdougall dmcdougall closed this Dec 7, 2012
@kdavies4
Copy link
Contributor Author

kdavies4 commented Dec 7, 2012

Yes, it should be closed.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants