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

3-3-3-outcomes edit #201

Merged
merged 4 commits into from
Dec 14, 2023
Merged

3-3-3-outcomes edit #201

merged 4 commits into from
Dec 14, 2023

Conversation

jeffkline
Copy link
Contributor

changed description of this support line item

changed description of this support line item
@clapierre clapierre self-requested a review December 14, 2023 17:50
@clapierre
Copy link
Contributor

Jeff, you added a couple new files, an apple .DS_Store and an index.rtf
Can you delete those from your pull request?

@jeffkline
Copy link
Contributor Author

jeffkline commented Dec 14, 2023 via email

error by novice
@jeffkline
Copy link
Contributor Author

jeffkline commented Dec 14, 2023 via email

@clapierre
Copy link
Contributor

clapierre commented Dec 14, 2023 via email

Copy link
Contributor

@clapierre clapierre left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This looks correct now, and changes were made.

@clapierre
Copy link
Contributor

Waiting for your review / merge David. Nice work Jeff!

@Helixopp
Copy link
Contributor

@clapierre Looks like Branch Conflicts need resolving first?

Copy link
Contributor

@Helixopp Helixopp left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Good work, team.

@clapierre
Copy link
Contributor

Sorry Jeff, for some reason the index.html file was renamed to 3-3-3-outcomes.html which was causing a conflict.
I have fixed this now. All checks passed and we should be able to Merge David.

@Helixopp Helixopp merged commit 1287de8 into main Dec 14, 2023
1 check passed
github-actions bot added a commit that referenced this pull request Dec 14, 2023
SHA: 1287de8
Reason: push, by Helixopp

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
@jeffkline
Copy link
Contributor Author

jeffkline commented Dec 15, 2023 via email

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.

None yet

3 participants