-
-
Notifications
You must be signed in to change notification settings - Fork 215
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
Translate comments #49
Conversation
Success. Great job. |
Hello. Did you based on the main branch or dev branch to do this work? |
I see you took the main branch. This was my mistake as I should have put the dev branch as the default for pull requests. But now I have both branches messed up, with latest dev branch commits!! |
I believe I fixed them and now are equal. Now the dev branch is the default branch for pull requests.. |
Yep, i used master. Let me know if help is needed with that |
Thanks. I changed in the github conf and now dev is the default branch for 2016-02-12 12:26 GMT-03:00 Daniel Campoverde Carrión [alx741] <
Andrés Martinelli |
Fool of me, didn't even notice the utils dir! Working on it... |
Ok, apparently some merge conflicts where unsolved, but after fix them new conflicts appeared relative to master and everything becomes a huge mess.
So here it is again in a new branch: the translations + the corrections were applied and now it compiles.