Fix silent conflicts due to merging #7256 after #7251#7316

rullzer merged 1 commit into

masternextcloud/server:masterfrom

fix-silent-conflicts-due-to-merging-7256-after-7251nextcloud/server:fix-silent-conflicts-due-to-merging-7256-after-7251Copy head branch name to clipboard