fix(ui): style conflict resolution buttons#6964
Merged
juliusknorr merged 5 commits intomainfrom Mar 18, 2025
Merged
Conversation
Codecov ReportAll modified and coverable lines are covered by tests ✅
Additional details and impacted files@@ Coverage Diff @@
## main #6964 +/- ##
==========================================
- Coverage 51.82% 51.82% -0.01%
==========================================
Files 476 476
Lines 40154 40148 -6
Branches 985 984 -1
==========================================
- Hits 20811 20805 -6
Misses 19237 19237
Partials 106 106 ☔ View full report in Codecov by Sentry. 🚀 New features to boost your workflow:
|
github-project-automation
bot
moved this to 🧭 Planning evaluation (don't pick)
in 📝 Office team
max-nextcloud
moved this from 🧭 Planning evaluation (don't pick)
to 👀 In review
in 📝 Office team
max-nextcloud
added
design
max-nextcloud
force-pushed
the
ui/review-with-marco
branch
3 times, most recently
from
4c37ee1 to
9447458
Compare
Collaborator
Author
|
/backport to stable31 |
Collaborator
Author
|
/backport to stable30 |
Signed-off-by: Max <max@nextcloud.com>
Signed-off-by: Marco Ambrosini <marcoambrosini@Mac.home>
Signed-off-by: Marco Ambrosini <marcoambrosini@Mac.home>
Signed-off-by: Max <max@nextcloud.com>
max-nextcloud
force-pushed
the
ui/review-with-marco
branch
from
9447458 to
5cf45eb
Compare
Signed-off-by: Max <max@nextcloud.com>
max-nextcloud
force-pushed
the
ui/review-with-marco
branch
from
5cf45eb to
c12d869
Compare
marcoambrosini
approved these changes
Mar 18, 2025
juliusknorr
approved these changes
Mar 18, 2025
4 tasks
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Fixes #2240
🖼️ Screenshots