From 09bc4891e8285b32967741ccb497d794399870a6 Mon Sep 17 00:00:00 2001
From: Alfranio Correia <alfranio.correia@sun.com>
Date: Thu, 14 Jan 2010 16:50:45 +0000
Subject: [PATCH] Removed garbage from the mysqld--help-win

---
 mysql-test/r/mysqld--help-win.result | 1 -
 1 file changed, 1 deletion(-)

diff --git a/mysql-test/r/mysqld--help-win.result b/mysql-test/r/mysqld--help-win.result
index ff882e4459c..7e261fc203c 100644
--- a/mysql-test/r/mysqld--help-win.result
+++ b/mysql-test/r/mysqld--help-win.result
@@ -993,7 +993,6 @@ use-symbolic-links                                FALSE
 verbose                                           TRUE
 wait-timeout                                      28800
 warnings                                          1
->>>>>>> MERGE-SOURCE
 
 To see what values a running MySQL server is using, type
 'mysqladmin variables' instead of 'mysqld --verbose --help'.