merge fix

0f579b97 · unknown · 0f20d17e · 0f579b97
Commit 0f579b97 authored Aug 17, 2006 by unknown
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
 #