Skip to content

Comments

Add desktop conflict files#431

Merged
Svanvith merged 5 commits intomainfrom
add-desktop-conflict-files
Aug 12, 2025
Merged

Add desktop conflict files#431
Svanvith merged 5 commits intomainfrom
add-desktop-conflict-files

Conversation

@Svanvith
Copy link
Contributor

@TheOneRing please have a look :)

@TheOneRing
Copy link
Contributor

You are using a preview of 2.0 which had an issue scaling the avatar see docs/user/desktop-client/img/conflict-files/conflict-info.png

@TheOneRing
Copy link
Contributor

Also the space image looks broken

@Svanvith
Copy link
Contributor Author

pic is now updated

Copy link
Contributor

@LisaHue LisaHue left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I would not write "under the hood" in line 48
otherwise it looks good to me 🚀

@Svanvith Svanvith merged commit 8ef4ab9 into main Aug 12, 2025
2 checks passed
@Svanvith Svanvith deleted the add-desktop-conflict-files branch August 12, 2025 08:01
@openclouders openclouders mentioned this pull request Aug 12, 2025
1 task
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants