-
Notifications
You must be signed in to change notification settings - Fork 21
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
Fix #54, Remove unnecessary parentheses around return values. #55
Conversation
@thnkslprpt Would you be able to resolve the conflicts? |
d20e209
to
89ede56
Compare
I think it's resolved now. |
Thanks! That would be good. I'll add this to the CCB agenda for today just so everyone can take a quick look since the scope increased a bit. |
@thnkslprpt CCB 6 October 2022: Approved pending resolution of failed workflow checks. |
05fe61a
to
dff2807
Compare
@thnkslprpt Would you be able to squash together the commits (so the commit message check passes)? |
Hi @dzbaker - I may need a bit of a hand with that... |
@thnkslprpt Hmm, that's odd. Are you able to change the commit message for the merge commit (using "git commit --amend") instead? |
f3360c2
to
8d84f21
Compare
I couldn't get it working in the original local git repository I used for these changes, but by opening a clean folder and cloning it in again, git finally let me amend the commit message of the merge commit. Still didn't let me squash them together, though... |
With the help of @skliper I was finally able to squash these 3 commits incl. the merge resolution into 1 clean commit. |
15bdb0b
to
111b861
Compare
111b861
to
838dbd1
Compare
838dbd1
to
e124beb
Compare
e124beb
to
faf21ec
Compare
Checklist (Please check before submitting)
Describe the contribution
This aligns these return statements with the predominant style of cFS.
Testing performed
None, prior to submission of the pull request.
Expected behavior changes
No impact on behavior.
Contributor Info - All information REQUIRED for consideration of pull request
@thnkslprpt