[X2Go-Commits] [x2goserver] 01/01: fix duplicate Conflicts: field in debian/control

[git-admin at x2go.org]

This is an automated email from the git hooks/post-receive script.

x2go pushed a commit to branch master
in repository x2goserver.

commit eb404df7315f4913ce6dbe86f76f9ab30e54dc32
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date:   Tue Dec 2 12:43:53 2014 +0100

    fix duplicate Conflicts: field in debian/control
---
 debian/control |    3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/debian/control b/debian/control
index cf212be..bd7d8f8 100644
--- a/debian/control
+++ b/debian/control
@@ -57,13 +57,12 @@ Conflicts:
  x2goserver-home,
  x2goserver-compat,
  x2goserver-pyhoca,
+ x2godesktopsharing (<< 3.1.1.2),
 Replaces:
  x2goserver-one,
  x2goserver-home,
  x2goserver-compat,
  x2goserver-pyhoca,
-Conflicts:
- x2godesktopsharing (<< 3.1.1.2),
 Description: X2Go server daemon scripts
  X2Go is a server based computing environment with
     - session resuming

--
Alioth's /srv/git/_hooks_/post-receive-email on /srv/git/code.x2go.org/x2goserver.git