🔄 Upstream sync failed - merge conflicts

[github-actions]

Upstream Sync Failed

The automated sync from slskd/slskd encountered merge conflicts.

New upstream commits: 2

Conflicting files:

README.md

How to resolve:

# Fetch upstream
git remote add upstream https://github.com/slskd/slskd.git
git fetch upstream

# Merge and resolve conflicts
git merge upstream/master
# ... resolve conflicts ...
git add .
git commit
git push

Close this issue once resolved.

[github-actions]

Sync attempt failed again

Date: 2025-12-09T00:16:54.839Z
New commits: 2

Conflicting files:

README.md

Manual intervention required.