-
Notifications
You must be signed in to change notification settings - Fork 2.3k
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
fixes #582 (Android not setting this onLayout first?) #789
Conversation
I have just merged #684. Please, resolve conflicts and I'll do a new release within this week |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Conflicts to be resolved
Styling fixed |
It seems you still have conflicts since I have merged #684. Please resolve them :) |
Call me a github noob, but how do I resolve conflicts directly? The button "resolve conflicts" is readonly for me, with this block for the conflict:
which is a difference of a line break. You can merge with or without? |
@fungilation, no worries ;) |
Here you go, no more conflicts |
Fixes #582