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

Add "address" and "postalCode" to "location" #110

Merged
merged 2 commits into from
Jul 15, 2014
Merged

Add "address" and "postalCode" to "location" #110

merged 2 commits into from
Jul 15, 2014

Conversation

ocram
Copy link
Contributor

@ocram ocram commented Jul 15, 2014

Intended changes by #109 without any tabs/spaces changes

@DonDebonair
Copy link
Member

Eeeer, I submitted a new PR an hour ago :) #109

@ocram
Copy link
Contributor Author

ocram commented Jul 15, 2014

@dandydev Yes, I saw it, and referenced it in this pull request, as you can see. Your new PR has tabs/space changes in about 150 lines again, however.

@DonDebonair
Copy link
Member

Ah, sorry, didn't see that. That's because of people not following the editorconf. I will close mine and merge this one.

DonDebonair added a commit that referenced this pull request Jul 15, 2014
Add "address" and "postalCode" to "location"
@DonDebonair DonDebonair merged commit bb01717 into jsonresume:master Jul 15, 2014
@ocram ocram deleted the address-postalCode branch July 15, 2014 14:57
@ocram
Copy link
Contributor Author

ocram commented Jul 15, 2014

@dandydev Yes, I agree that we should definitely apply the style from the editor config to all files as soon as possible.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants