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.

Sign up for GitHub

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

Jump to bottom

Fix #37, Apply style #91

Closed
wants to merge 1 commit into from
Closed

Fix #37, Apply style #91

wants to merge 1 commit into from

Conversation

yammajamma
Copy link
Contributor

@yammajamma yammajamma commented Aug 27, 2020 •
edited by astrogeco
Loading

Describe the contribution
Fix #37 - applies standard coding style

Testing performed
CI only, whitespace.

Expected behavior changes
None

System(s) tested on
CI

Additional context
Redoing #88 which was accidentally merged

Third party code
None

Contributor Info - All information REQUIRED for consideration of pull request
Jacob Hageman - NASA/GSFC

@astrogeco astrogeco linked an issue Aug 27, 2020 that may be closed by this pull request
Apply code style #37
Closed
@astrogeco
Copy link
Contributor

astrogeco commented Aug 27, 2020 •
edited
Loading

@skliper can you rebase and fix this conflict? We tried to merge locally but it ended up with a strange commit log sequence

(2) Otherwise we can also apply clang-format to the current IC and close this.

@astrogeco
Copy link
Contributor

See https://github.com/nasa/sample_app/tree/apply-style-again for option (2) above

@astrogeco astrogeco changed the base branch from integration-candidate to apply-style-again August 27, 2020 16:34
@astrogeco astrogeco changed the base branch from apply-style-again to integration-candidate August 27, 2020 16:36
@skliper
Copy link
Contributor

skliper commented Aug 27, 2020

Applying style again works for me.

@astrogeco astrogeco closed this Aug 27, 2020
@astrogeco
Copy link
Contributor

See #92

@skliper skliper added the duplicate This issue or pull request already exists label Aug 28, 2020
@skliper skliper deleted the fix37-apply-style branch February 1, 2021 19:56
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
duplicate This issue or pull request already exists
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

Apply code style
3 participants
@yammajamma @astrogeco @skliper