This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch master in repository nx-libs. commit ef4a6c8451eadd18db3cd1ba4b28b959ba0c60d7 Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Date: Mon Oct 13 13:49:42 2014 +0200 nx-libs.spec: Do not conflict with nx... This will break our own neck. --- nx-libs.spec | 1 - 1 file changed, 1 deletion(-) diff --git a/nx-libs.spec b/nx-libs.spec index 92b2f34..a8d5d22 100644 --- a/nx-libs.spec +++ b/nx-libs.spec @@ -95,7 +95,6 @@ Requires: %{name}%{?_isa} = %{version}-%{release} %if 0%{?suse_version} Requires: xorg-x11-fonts-core %endif -Conflicts: nx %description -n libNX_X11 The X Window System is a network-transparent window system that was -- Alioth's /srv/git/_hooks_/post-receive-email on /srv/git/code.x2go.org/nx-libs.git