Accepting request 297257 from devel:languages:python

1

OBS-URL: https://build.opensuse.org/request/show/297257
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/salt?expand=0&rev=43

salt.spec

@@ -16,7 +16,7 @@
 #
 
 Name:           salt
-Version:        2014.7.2
+Version:        2014.7.4
 Release:        0
 Summary:        A parallel remote execution system
 License:        Apache-2.0
@@ -242,7 +242,6 @@ Bash command line completion support for %{name}.
 %package zsh-completion
 Summary:        Zsh Completion for %{name}
 Group:          System/Management
-Conflicts:		salt-zsh-completion
 Requires:       %{name} = %{version}
 Requires:       zsh
 BuildArch:      noarch