Removed garbage from the mysqld--help-win

09bc4891 · Alfranio Correia · 20fd7e59 · 09bc4891
Commit 09bc4891 authored Jan 14, 2010 by Alfranio Correia
Hide whitespace changes
Inline Side-by-side

Showing with 0 additions and 1 deletion

mysql-test/r/mysqld--help-win.result mysql-test/r/mysqld--help-win.result +0 -1

No files found.
--- 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'.