unnecessary pull #24

Merged
merged 1 commit into from Jun 21, 2012

Projects

None yet

2 participants

@lkrids
lkrids commented Jun 21, 2012

There is no need to assign picImg outside of the if branch.

Somewhere between 5cfe8c7 and c839311 the second else if was removed, but it doesn't show up in the diff. I had checked out and submitted a patch for the c839311 version, the current version at the time. The better fix is to remove the second else if and it seems like it was there in the first place because of a bad merge.

@scottjehl
Owner

Hmm okay yeah, that makes sense. Can you make the full change here? Then I'll test and pull it in.

@lkrids
lkrids commented Jun 21, 2012

Things some how got screwed up. The fix is removing the second else if which already happened between 5cfe8c7 and c839311. This pull request is undoing the pull request I sent yesterday (#21) because it is no longer needed.

@scottjehl scottjehl merged commit ff12494 into scottjehl:master Jun 21, 2012
@scottjehl
Owner

great, thanks!

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment