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

Try to fix merge conflict #474

Merged
merged 2 commits into from
Feb 16, 2022
Merged

Try to fix merge conflict #474

merged 2 commits into from
Feb 16, 2022

Conversation

cansavvy
Copy link
Collaborator

Purpose/implementation Section

What changes are being implemented in this Pull Request?

Changing to strategy-ours for merge conflict for render preview

@github-actions
Copy link
Contributor

github-actions bot commented Feb 16, 2022

No spelling errors! 🎉
Comment updated at 2022-02-16 with changes from f026244

@github-actions
Copy link
Contributor

github-actions bot commented Feb 16, 2022

Re-rendered previews from the latest commit:

Updated at 2022-02-16 with changes from f026244

@cansavvy cansavvy merged commit 7e94925 into main Feb 16, 2022
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