Skip to content

Conversation

ovari
Copy link
Contributor

@ovari ovari commented Oct 26, 2024

No description provided.

@knadh
Copy link
Owner

knadh commented Oct 28, 2024

There are a few merge conflicts now owing to the big release yesterday. Please address them and we can merge. Thank you.

@ovari
Copy link
Contributor Author

ovari commented Oct 28, 2024

There are a few merge conflicts now owing to the big release yesterday. Please address them and we can merge. Thank you.

How can this be resolved using the web browser to fix?

Can you please fix them if it is not too inconvenient for you?

Thank you

@ovari
Copy link
Contributor Author

ovari commented Oct 28, 2024

There are a few merge conflicts now owing to the big release yesterday. Please address them and we can merge. Thank you.

If you can fix and merge and then if there are new strings to fix, can do in another patch.

Sorry, don't have an IDE. Only using the web browser to provide patches.

Thank you once again.

@ovari
Copy link
Contributor Author

ovari commented Oct 28, 2024

Should be done. Thank you

@knadh knadh merged commit be9fe9c into knadh:master Oct 29, 2024
ai-armageddon pushed a commit to Twitter-outreach/ListMonk that referenced this pull request Mar 11, 2025
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