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.

Sign up for GitHub

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

Jump to bottom

List a tiny JS world by AlinaLadybug #29

Merged
merged 2 commits into from
Dec 21, 2018
Merged

List a tiny JS world by AlinaLadybug #29

merged 2 commits into from
Dec 21, 2018

Conversation

AlinaLadybug
Copy link
Contributor

No description provided.

@OleksiyRudenko
Copy link
Owner

@AlinaLadybug Thank you for the submission. Please, resolve conflict as world.md has got updated.

@OleksiyRudenko OleksiyRudenko added the merge-conflict Code conflicts in PR. label Dec 21, 2018
OleksiyRudenko
OleksiyRudenko approved these changes Dec 21, 2018
View reviewed changes
Copy link
Owner

@OleksiyRudenko OleksiyRudenko left a comment

Choose a reason for hiding this comment

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

@AlinaLadybug 👍

P.S. Please, in similar cases add new lines after. Git cannot handle changes properly when structure is similar. So it results in like you removed something and added back again. This is smth specific to a structured data.

image

@OleksiyRudenko OleksiyRudenko removed the merge-conflict Code conflicts in PR. label Dec 21, 2018
@OleksiyRudenko OleksiyRudenko merged commit 495b963 into OleksiyRudenko:master Dec 21, 2018
kovalov pushed a commit to kovalov/a-tiny-JS-world that referenced this pull request Aug 1, 2022
@AlinaLadybug
List a tiny JS world by AlinaLadybug (OleksiyRudenko#29)
01bb125
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@OleksiyRudenko OleksiyRudenko OleksiyRudenko approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@AlinaLadybug @OleksiyRudenko