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

[my] Completed basics lessons and 2 advanced lessons #293

Merged
merged 24 commits into from
Apr 21, 2016

Conversation

alkaha
Copy link
Contributor

@alkaha alkaha commented Apr 17, 2016

I've completed basics lessons and 2 advanced lessons.

@doomspork doomspork added the translation The translation of Elixir School content label Apr 17, 2016
@@ -6,7 +6,11 @@ order: 8
lang: my
---

<<<<<<< HEAD
Copy link
Member

Choose a reason for hiding this comment

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

@alkaha there appear to be a bunch of merge conflicts in this file, can you look at resolving them?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

done. :)

my: Pelajaran mengenai bahasa aturcara Elixir
pl: Lekcje programowania w języku Elixir
Copy link
Member

Choose a reason for hiding this comment

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

I don't think we need this change, can you remove this file?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

it was edited due to merge error. how do I remove this file from this commit?

@doomspork
Copy link
Member

This is great @alkaha, thank you so much! I left some feedback for you, I'd love to get your thoughts.

@doomspork
Copy link
Member

Sorry for the delay @alkaha, I've been busy with work. This looks good, I will merge and send out a tweet! Thank you very much

@doomspork doomspork merged commit 7977ca6 into elixirschool:master Apr 21, 2016
@alkaha
Copy link
Contributor Author

alkaha commented Apr 22, 2016

thanks for the merge. :)

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
translation The translation of Elixir School content
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants