Updated api-basics.md

[kinlane]

This pull request has been automatically generated by Prose.io.

[benbalter]

👍

[parkr]

👍

[benbalter]

@kinlane it looks like #10's merge caused a conflict. Might you be able to merge in master so that it merges cleanly?

If using command line git, I believe it's just git pull https://github.com/project-open-data/project-open-data.github.io.git and then git push.

[kinlane]

I just unpublished it. The merge hung up on my end.

I'll leave to you guys to edit the typo I was fixing.

Let me know if that works...

Kin Lane
[email protected]
apievangelist.com / apivoice.com

On Wed, May 15, 2013 at 1:22 PM, Ben Balter [email protected]:

@kinlane https://github.com/kinlane it looks like #10#10
merge caused a conflict. Might you be able to merge in master so that it
merges cleanly?

If using command line git, I believe it's just git pull
https://github.com/project-open-data/project-open-data.github.io.git and
then git push.

—
Reply to this email directly or view it on GitHubhttps://github.com//pull/26#issuecomment-17963708
.