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

es-ES: Apply #1773,#1781,#1786,#1789,#1795,#1804,#1809,#1813,#1821,#1826,#1828 #1834

Closed
wants to merge 4 commits into from
Closed

es-ES: Apply #1773,#1781,#1786,#1789,#1795,#1804,#1809,#1813,#1821,#1826,#1828 #1834

wants to merge 4 commits into from

Conversation

frenchiveruti
Copy link
Contributor

@frenchiveruti
Copy link
Contributor Author

Hope there's no issues

@frenchiveruti frenchiveruti changed the title es-ES: Apply #1763,#1773,#1781,#1786,#1789,#1795,#1804,#1809,#1813,#1821,#1826,#1828 es-ES: Apply #1773,#1781,#1786,#1789,#1795,#1804,#1809,#1813,#1821,#1826,#1828 Mar 27, 2020
@Gymnasiast
Copy link
Member

You need to resolve the merge conflict.

@frenchiveruti
Copy link
Contributor Author

Ok I'll cancel it and forget about it because I don't see what's the issue.
Really git is a problem for me.

@frenchiveruti frenchiveruti deleted the es-ES branch March 27, 2020 23:48
@tupaschoal tupaschoal mentioned this pull request Mar 28, 2020
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
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
@frenchiveruti @Gymnasiast