Upload are deleted after decision was made in conflict activity#7102

tobiasKaminsky merged 1 commit intomasternextcloud/android:masterfrom

conflictAutoUploadnextcloud/android:conflictAutoUploadCopy head branch name to clipboard