[WIP] The conflict dialog is shown when there is a conflict between 2 files. currently, mimetype icons are shown as placeholders.#8707

Copilot wants to merge 1 commit intomasternextcloud/desktop:masterfrom

copilot/fix-040f120d-b1c9-419d-bb0f-2a642971ddd4nextcloud/desktop:copilot/fix-040f120d-b1c9-419d-bb0f-2a642971ddd4Copy head branch name to clipboard