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

Add an introduction for ASCornerLayoutSpec in layout2-layoutspec-types.md #trivial #1005

Closed
wants to merge 18 commits into from

Conversation

huang-kun
Copy link
Contributor

Add an introduction for ASCornerLayoutSpec in layout2-layoutspec-types.md

@maicki
Copy link
Contributor

maicki commented Jul 4, 2018

Hey @huang-kun I think this PR was opened accidentally. I will close it. Thanks!

@maicki maicki closed this Jul 4, 2018
@huang-kun
Copy link
Contributor Author

@maicki Would you add an introduction for new features in version 2.7? Here

@maicki
Copy link
Contributor

maicki commented Jul 5, 2018

@huang-kun Ah sorry I apologize for closing it. There were merge conflicts in there and the title was not really describing what the PR is about, so I thought it was created accidentally.

I will reopen the PR, can you please remove all of the merge conflicts and squash the branch into one?

Thanks!

@maicki maicki reopened this Jul 5, 2018
@@ -49,30 +49,50 @@ NS_ASSUME_NONNULL_BEGIN
@param location The corner position option.
@return An ASCornerLayoutSpec object with a given child and an layoutElement that act as corner.
*/
<<<<<<< HEAD
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please remove all of the merge conflicts.

@maicki maicki changed the title Master Add an introduction for ASCornerLayoutSpec in layout2-layoutspec-types.md #trivial Jul 5, 2018
@CLAassistant
Copy link

CLAassistant commented Jul 6, 2018

CLA assistant check
Thank you for your submission, we really appreciate it. Like many open source projects, we ask that you all sign our Contributor License Agreement before we can accept your contribution.
2 out of 3 committers have signed the CLA.

✅ nguyenhuy
✅ huang-kun
❌ huangkun


huangkun seems not to be a GitHub user. You need a GitHub account to be able to sign the CLA. If you have already a GitHub account, please add the email address used for this commit to your account.
You have signed the CLA already but the status is still pending? Let us recheck it.

@garrettmoon
Copy link
Member

@huang-kun would you mind squashing your commits or updating the author on them? A few of them look like they have a non-github author.

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.

5 participants