From 539f8e4a9dd6f929ca3961aee1750fd6e517d6f0 Mon Sep 17 00:00:00 2001
From: amber <amber@54d463be-8e91-2dee-dedb-b68131a5f0ec>
Date: Fri, 10 Dec 2004 04:33:12 +0000
Subject: [PATCH] update

git-svn-id: https://svn.code.sf.net/p/rathena/svn/branches/stable@526 54d463be-8e91-2dee-dedb-b68131a5f0ec
---
 Changelog.txt       | 2 ++
 src/map/atcommand.c | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/Changelog.txt b/Changelog.txt
index 64e8f1fc3d..dc87a72119 100644
--- a/Changelog.txt
+++ b/Changelog.txt
@@ -1,4 +1,6 @@
 Date	Added
+12/9
+	* Adjusted some messages in @marry [MouseJstr]
 12/8
 	* Fixed @rings [MouseJstr]
         * Added @marry, @divorce, and @rings [MouseJstr]
diff --git a/src/map/atcommand.c b/src/map/atcommand.c
index 32f0e4befb..503e64e7d2 100644
--- a/src/map/atcommand.c
+++ b/src/map/atcommand.c
@@ -7442,7 +7442,7 @@ atcommand_marry(const int fd, struct map_session_data* sd,
   }
 
   if (pc_marriage(pl_sd1, pl_sd2) == 0) {
-    clif_displaymessage(fd, "The marriage has failed.. talk to the judge..");
+    clif_displaymessage(fd, "They are married.. wish them well");
     return 0;
   } else
     return -1;