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

Fix merge conflicts found in docs #252

Merged
merged 1 commit into from
Dec 19, 2023
Merged

Fix merge conflicts found in docs #252

merged 1 commit into from
Dec 19, 2023

Conversation

No767
Copy link
Member

@No767 No767 commented Dec 19, 2023

Summary

When fixing the merge conflict, the contents of the docs were not scanned and fixed. As a result, parts of the docs completely broke

Types of changes

What types of changes does your code introduce to the UC Merced's ACM Chapter Website?
Put an x in the boxes that apply

  • Bugfix (non-breaking change which fixes an issue)
  • New feature (non-breaking change which adds functionality)
  • Breaking change (fix or feature that would cause existing functionality to not work as expected)
  • Documentation Update (Updates to README.md, the documentation, etc)
  • Other (if none of the other choices apply)

Checklist

Put an x in the boxes that apply

  • If code changes were made then they have been tested.
    • I have updated the documentation to reflect the changes. (if appropriate)
  • Lint, format, and unit test workflows pass with my new changes
  • This PR does not address a duplicate issue or PR

@No767 No767 merged commit 6fa49ec into react-rewrite Dec 19, 2023
2 checks passed
@No767 No767 deleted the noelle/fix-docs branch December 19, 2023 07:59
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.

1 participant