From 123347cd5c02b90c5cd539f793c3d06ee0577199 Mon Sep 17 00:00:00 2001
From: Jay Sorg <jay.sorg@gmail.com>
Date: Mon, 19 May 2014 22:39:25 -0700
Subject: [PATCH] xrdp: update web site

Conflicts:

	xrdp/xrdp.c
---
 xrdp/xrdp.c | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/xrdp/xrdp.c b/xrdp/xrdp.c
index 887ada68..c7cf4af8 100644
--- a/xrdp/xrdp.c
+++ b/xrdp/xrdp.c
@@ -435,8 +435,13 @@ 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");
@@ -453,8 +458,13 @@ 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();