From c65d3b6b977df36666cbabc2642ede1b3991bae8 Mon Sep 17 00:00:00 2001
From: Ran <huangran.alex@gmail.com>
Date: Thu, 6 Jul 2023 15:14:55 +0800
Subject: [PATCH] Update partitioned-table.md

---
 partitioned-table.md | 7 -------
 1 file changed, 7 deletions(-)

diff --git a/partitioned-table.md b/partitioned-table.md
index e25a7cf6a87c6..d3214e5c61851 100644
--- a/partitioned-table.md
+++ b/partitioned-table.md
@@ -719,14 +719,7 @@ You can see that the inserted record `(NULL, 'mothra')` falls into the same part
 
 For `LIST` and `RANGE` partitioned tables, you can add and drop partitions using the `ALTER TABLE <table name> ADD PARTITION (<partition specification>)` or `ALTER TABLE <table name> DROP PARTITION <list of partitions>` statement.
 
-<<<<<<< HEAD
 For `LIST` and `RANGE` partitioned tables, `REORGANIZE PARTITION` is not yet supported.
-=======
-- Add partitions using the `ALTER TABLE <table name> ADD PARTITION (<partition specification>)` statement.
-- Drop partitions using the `ALTER TABLE <table name> DROP PARTITION <list of partitions>` statement.
-- Remove all data from specified partitions using the `ALTER TABLE <table name> TRUNCATE PARTITION <list of partitions>` statement. The logic of `TRUNCATE PARTITION` is similar to [`TRUNCATE TABLE`](/sql-statements/sql-statement-truncate.md) but it is for partitions.
-- Merge, split, or make other changes to the partitions using the `ALTER TABLE <table name> REORGANIZE PARTITION <list of partitions> INTO (<new partition definitions>)` statement.
->>>>>>> bad9362ff (fix range columns examples (#14040))
 
 For `HASH` partitioned tables, `COALESCE PARTITION` and `ADD PARTITION` are not yet supported.