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

Just call super when dismissing if there's a presented view #156

Merged
merged 2 commits into from
Feb 2, 2016

Conversation

livings124
Copy link
Contributor

This should resolve #125.

@cdzombak
Copy link
Contributor

cdzombak commented Feb 2, 2016

@livings124 this branch has conflicts that will need to be resolved; I suspect as a result of #137

# Conflicts:
#	Pod/Classes/ios/NYTPhotosViewController.m
@livings124
Copy link
Contributor Author

Whoops! Should be fixed now.

@cdzombak cdzombak self-assigned this Feb 2, 2016
@cdzombak
Copy link
Contributor

cdzombak commented Feb 2, 2016

Looks straightforward and logical. Thanks, @livings124!

(and I've tested this locally and it works.)

cdzombak added a commit that referenced this pull request Feb 2, 2016
Just call super when dismissing if there's a presented view
@cdzombak cdzombak merged commit 91ab03c into nytimes:develop Feb 2, 2016
@livings124 livings124 deleted the dismiss-presented branch February 2, 2016 23:53
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.

2 participants