Skip to content

Conversation

@SavannahRicks
Copy link
Contributor

No description provided.

@SavannahRicks
Copy link
Contributor Author

The conflicts are simple, main is the one we want to keep since it's newer

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.

2 participants