post-merge fix

967f7ff5 · unknown · b9b141f1 · 967f7ff5
Commit 967f7ff5 authored Mar 06, 2006 by unknown
Hide whitespace changes
Inline Side-by-side

Showing with 0 additions and 1 deletion

mysql-test/r/grant.result mysql-test/r/grant.result +0 -1

No files found.
--- a/mysql-test/r/grant.result
+++ b/mysql-test/r/grant.result
@@ -642,4 +642,3 @@ delete from mysql.db where user='mysqltest1';
 delete from mysql.tables_priv where user='mysqltest1';
 flush privileges;
 drop database mysqltest;
-