Skip to content

Conversation

@StarmanMine142
Copy link
Contributor

No description provided.

@mysticdrew
Copy link
Member

@StarmanMine142
Thanks for the contribution. I updated the repo with the latest version of journeymap. Can you please resolve the conflicts and I will merge.

@StarmanMine142
Copy link
Contributor Author

I don't quite understand, but what does this file conflict with?

@mysticdrew
Copy link
Member

I fixed it

@mysticdrew mysticdrew merged commit 81da00a into TeamJM:master Jan 30, 2025
@mysticdrew
Copy link
Member

I fixed the conflicts, however, there have been some additions to the file, feel free to create a new PR with the updates to the new keys.

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