I added some online code schools to the code schools page (Bloc, The Firehose Project, Tealeaf Academy).

@charlessipe - Thanks so much for your contribution! Can you please take out those .DS_store files, move the others to "Learning Resources" as they are online resources only. Also, remove number. We'd have to add numbers to all the services. Those might change more periodically than the URL. Thanks!

@nanoxd

Hmm. Why can't I merge this request?

says merge conflict? there are some DS_STORE files in the pr as well.

I think @charlessipe needs to make a branch from his master?, then submit that pull request to merge to upstream master. Not sure if that is required or not.

Think that's right. Possible @charlessipe https://github.com/charlessipe?

On Tue, Jul 21, 2015 at 6:57 AM, Eric Mckenna [email protected]
wrote:

I think @charlessipe https://github.com/charlessipe needs to make a
branch from his master?, then submit that pull request to merge to upstream
master. Not sure if that is required or not.

—
Reply to this email directly or view it on GitHub
#1 (comment)
.

David
t. @davidcmolina https://twitter.com/davidcmolina
http://davidmolina.github.io/

Hi @charlessipe,

Looks like this PR is over a year old. Is the info still relevant? If it is can you rebase onto master and resubmit?