cloud sync: conflict resolution#18527

LibretroAdmin merged 1 commit intolibretro:masterlibretro/RetroArch:masterfrom

warmenhoven:warmenhoven/pr/conflictwarmenhoven/RetroArch:warmenhoven/pr/conflictCopy head branch name to clipboard