merge fix

82e942ef · mikael/pappa@dator5.(none) · b738fd4d · 82e942ef
Commit 82e942ef authored Aug 17, 2006 by mikael/pappa@dator5.(none)
Show whitespace changes
Inline Side-by-side

Showing with 1 addition and 1 deletion

mysql-test/t/partition.test mysql-test/t/partition.test +1 -1

No files found.
--- a/mysql-test/t/partition.test
+++ b/mysql-test/t/partition.test
@@ -49,7 +49,7 @@ show table status;
 insert into t1 values (NULL), (NULL), (NULL), (NULL);
 show table status;
 drop table t1;
->>>>>>>
+
 #
 # Bug 19309 Partitions: Crash if double procedural alter
 #