[master] rpm: remove "Conflicts: docker-ee, docker-ee-cli"#1020

thaJeztah wants to merge 1 commit intodocker:masterdocker/docker-ce-packaging:masterfrom

thaJeztah:rpm_remove_eethaJeztah/docker-ce-packaging:rpm_remove_eeCopy head branch name to clipboard