Fixed conflict issue on f20

when installing vim-enhanced and vim-minimal is not updated it conflicts and
fails

Change-Id: Ib3accc846dd41f8d36f740f003d8039552ec54af
Signed-off-by: David Caro <dcaroest@redhat.com>