Skip to content
This repository has been archived by the owner on Oct 28, 2022. It is now read-only.

Fixing comment whitespace to be up to spec. #205

Merged
merged 1 commit into from
Dec 17, 2014
Merged

Fixing comment whitespace to be up to spec. #205

merged 1 commit into from
Dec 17, 2014

Conversation

adamnovak
Copy link
Contributor

No description provided.

This was referenced Dec 5, 2014
Merged
Merged
@jeromekelleher
Copy link
Contributor

Looks good @adamnovak, +1. It be good to squash these commits down though.

@adamnovak
Copy link
Contributor Author

How about now?

@jeromekelleher
Copy link
Contributor

Perfect - thanks @adamnovak. +1.

@benedictpaten
Copy link
Contributor

+1

@delagoya
Copy link
Contributor

I vote that we merge #209 prior to this one, since that one introduces structural changes and may introduce conflicts with this merge. If that is the case, after I merge #209, I will fix any conflicts with this commit, then merge into master. Any objections?

@delagoya delagoya merged commit 940fa35 into ga4gh:master Dec 17, 2014
delagoya added a commit that referenced this pull request Dec 17, 2014
@delagoya
Merged conflicts from #209 and #205.
2cbb1dc
delagoya added a commit that referenced this pull request Dec 17, 2014
@delagoya
Merge branch 'adamnovak-whitespace'.
1dfcdea 
This was a merge of conflicts between PR #209 and #205. Whitespace issues
now integrated with the namespacing of methods and models.
@adamnovak adamnovak deleted the whitespace branch April 30, 2015 22:25
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Reviewers
No reviews
Assignees
No one assigned
Labels
Mergeable
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@adamnovak @jeromekelleher @benedictpaten @delagoya