[debian-edu-commits] debian-edu/ 09/09: opps, cherry pick fix

[Dominik George]

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

natureshadow-guest pushed a commit to annotated tag v0.8.0
in repository xrdp.

commit 0987feb42ffbe2976ba9f86857dad510b243ebc8
Author: Jay Sorg <jay.sorg at gmail.com>
Date:   Mon May 19 22:41:42 2014 -0700

    opps, cherry pick fix
---
 xrdp/xrdp.c | 10 ----------
 1 file changed, 10 deletions(-)

diff --git a/xrdp/xrdp.c b/xrdp/xrdp.c
index c7cf4af..cb8b73f 100644
--- a/xrdp/xrdp.c
+++ b/xrdp/xrdp.c
@@ -435,13 +435,8 @@ main(int argc, char **argv)
     {
         g_writeln("");
         g_writeln("xrdp: A Remote Desktop Protocol server.");
-<<<<<<< HEAD
-        g_writeln("Copyright (C) Jay Sorg 2004-2013");
-        g_writeln("See http://xrdp.sourceforge.net for more information.");
-=======
         g_writeln("Copyright (C) Jay Sorg 2004-2014");
         g_writeln("See http://www.xrdp.org for more information.");
->>>>>>> ec44b9d... xrdp: update web site
         g_writeln("");
         g_writeln("Usage: xrdp [options]");
         g_writeln("   --help: show help");
@@ -458,13 +453,8 @@ main(int argc, char **argv)
     {
         g_writeln("");
         g_writeln("xrdp: A Remote Desktop Protocol server.");
-<<<<<<< HEAD
-        g_writeln("Copyright (C) Jay Sorg 2004-2013");
-        g_writeln("See http://xrdp.sourceforge.net for more information.");
-=======
         g_writeln("Copyright (C) Jay Sorg 2004-2014");
         g_writeln("See http://www.xrdp.org for more information.");
->>>>>>> ec44b9d... xrdp: update web site
         g_writeln("Version %s", PACKAGE_VERSION);
         g_writeln("");
         g_deinit();

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-edu/pkg-team/xrdp.git