From 56e1d96122666d3532cb5be9bacc5f235cae0675 Mon Sep 17 00:00:00 2001
From: "tnurnberg@salvation.intern.azundris.com" <>
Date: Wed, 19 Jul 2006 16:50:55 +0200
Subject: [PATCH] manual merge, part 2/2

---
 mysql-test/r/mysqldump.result | 1 -
 1 file changed, 1 deletion(-)

diff --git a/mysql-test/r/mysqldump.result b/mysql-test/r/mysqldump.result
index 9abc83b223..ff745021ef 100644
--- a/mysql-test/r/mysqldump.result
+++ b/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`;
-- 
2.30.9