From ef4a6c8451eadd18db3cd1ba4b28b959ba0c60d7 Mon Sep 17 00:00:00 2001
From: Mike Gabriel <mike.gabriel@das-netzwerkteam.de>
Date: Mon, 13 Oct 2014 13:49:42 +0200
Subject: 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 92b2f3411..a8d5d22ea 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
-- 
cgit v1.2.3