From 0f579b9771c207e4ba7bdda0fe8f0d18e99942ef Mon Sep 17 00:00:00 2001
From: unknown <mikael/pappa@dator5.(none)>
Date: Thu, 17 Aug 2006 09:08:53 -0400
Subject: [PATCH] merge fix

---
 mysql-test/t/partition.test | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mysql-test/t/partition.test b/mysql-test/t/partition.test
index 5c5a7a430e3..c03ac3c3192 100644
--- 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
 #