-
Notifications
You must be signed in to change notification settings - Fork 1.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
Add an introduction for ASCornerLayoutSpec in layout2-layoutspec-types.md #trivial #1005
Conversation
Add ASCornerLayoutSpec introduction for version 2.7 and above.
Hey @huang-kun I think this PR was opened accidentally. I will close it. Thanks! |
@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! |
Source/Layout/ASCornerLayoutSpec.h
Outdated
@@ -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 |
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.
Please remove all of the merge conflicts.
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. |
This reverts commit dd1c623.
@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. |
Add an introduction for ASCornerLayoutSpec in layout2-layoutspec-types.md