manual merge, part 2/2

mysql-test/r/mysqldump.result:
  manual mergies, part 2/2

mysql-test/r/mysqldump.result

@@ -2818,7 +2818,6 @@ create database mysqldump_views;
 use mysqldump_views;
 create view nasishnasifu as select mysqldump_tables.basetable.id from mysqldump_tables.basetable;
 
-
 CREATE DATABASE /*!32312 IF NOT EXISTS*/ `mysqldump_tables` /*!40100 DEFAULT CHARACTER SET latin1 */;
 
 USE `mysqldump_tables`;