-
Notifications
You must be signed in to change notification settings - Fork 193
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
Made a Apple Logo Art #85
Open
AnshDeep24
wants to merge
3
commits into
salil-naik:updates
Choose a base branch
from
AnshDeep24:main
base: updates
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Hi @AnshDeep24, please resolve the conflicts. |
Sir could u pls help me with that I was not able to understand to solve
merge conflicts
…On Sat, 17 Apr 2021 at 4:43 PM, Salil Naik ***@***.***> wrote:
Hi @AnshDeep24 <https://github.com/AnshDeep24>, please resolve the
conflicts.
—
You are receiving this because you were mentioned.
Reply to this email directly, view it on GitHub
<#85 (comment)>,
or unsubscribe
<https://github.com/notifications/unsubscribe-auth/AOEU6E42Q6OSTK4FTBERW5LTJFUL7ANCNFSM42LQLHBQ>
.
|
@AnshDeep24 revert any changes made to yarn.lock file. Conflicts will get resolved. |
Deploy request for css-art-gallery pending review. Review with commit 0b58b48 |
@salil-naik I had resolve the conflicts sir "deleted yarn.lock" |
Please make sure to resolve all the conflicts and then push the code. |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Description
Art showing Apple logo
Insert the image of the art below
![Screen Shot 2021-04-04 at 8 57 27 PM](https://user-images.githubusercontent.com/59330323/113513814-0dd43000-9589-11eb-89fe-ed3bc347f280.png)
Fixes #84
Checklist:
[x]