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

fixes #582 (Android not setting this onLayout first?) #789

Merged
merged 4 commits into from
Nov 26, 2018

Conversation

fungilation
Copy link
Contributor

@fungilation fungilation commented May 23, 2018

Fixes #582

src/index.js Outdated Show resolved Hide resolved
@arribbar
Copy link
Collaborator

I have just merged #684. Please, resolve conflicts and I'll do a new release within this week

Copy link
Collaborator

@arribbar arribbar left a 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

@fungilation
Copy link
Contributor Author

Styling fixed

@arribbar
Copy link
Collaborator

It seems you still have conflicts since I have merged #684. Please resolve them :)

@fungilation
Copy link
Contributor Author

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:

<<<<<<< master
=======

>>>>>>> master

which is a difference of a line break. You can merge with or without?

@arribbar
Copy link
Collaborator

@fungilation, no worries ;)
I am not very familiar working with forks but you cannot do it here as you have only read rights. You should be able to do it from your fork. Else, you can still do it in local...

@fungilation
Copy link
Contributor Author

Here you go, no more conflicts

@arribbar arribbar merged commit 6333668 into leecade:master Nov 26, 2018
@arribbar arribbar mentioned this pull request Nov 26, 2018
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