Concrete Parallel collections article translated

[santiagobasulto]

It's done!

[heathermiller]

Hi Santiago- I can't merge this-- it's pointing to gh-pages (a few months ago, github stopped generating sites on gh-pages branches, forcing us to branch gh-pages to master) and is attempting to pull in several additional commits from master. I've got to manually merge it instead. For the next translation, could you please switch to pull requests on master?

Thanks a lot, btw, for the shiny new translation!

[santiagobasulto]

Hey, sorry for that! I was still working on gh-pages!

Do you want me to move it into master and send you another pull request?

2012/5/21 Heather Miller
[email protected]:

Hi Santiago- I can't merge this-- it's pointing to gh-pages (a few months ago, github stopped generating sites on gh-pages branches, forcing us to branch gh-pages to master) and is attempting to pull in several additional commits from master. I've got to manually merge it instead. For the next translation, could you please switch to pull requests on master?

Thanks a lot, btw, for the shiny new translation!

---

Reply to this email directly or view it on GitHub:
#88 (comment)

Santiago Basulto.-

[heathermiller]

No worries, I just manually merged it and referenced you in the commit, so you've still got credit for it :)
Next time around, just push to master and send your pull to scala/scala.github.com:master

[santiagobasulto]

Ok, thank you Heather!

2012/5/21 Heather Miller
[email protected]:

No worries, I just manually merged it and referenced you in the commit, so you've still got credit for it :)
Next time around, just push to master and send your pull to scala/scala.github.com:master

---

Reply to this email directly or view it on GitHub:
#88 (comment)

Santiago Basulto.-

[heathermiller]

No worries, thank you!