[iotdb] branch rel/1.0 updated: Remove conflict code (#8753)

[ca...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

caogaofei pushed a commit to branch rel/1.0
in repository https://gitbox.apache.org/repos/asf/iotdb.git


The following commit(s) were added to refs/heads/rel/1.0 by this push:
     new 64ca9ef444 Remove conflict code (#8753)
64ca9ef444 is described below

commit 64ca9ef4447caa25db3eb3eb1894dc4e22e30ffd
Author: Beyyes <cg...@foxmail.com>
AuthorDate: Wed Jan 4 22:48:24 2023 +0800

    Remove conflict code (#8753)
---
 .../java/org/apache/iotdb/db/mpp/common/header/ColumnHeaderConstant.java | 1 -
 1 file changed, 1 deletion(-)

diff --git a/server/src/main/java/org/apache/iotdb/db/mpp/common/header/ColumnHeaderConstant.java b/server/src/main/java/org/apache/iotdb/db/mpp/common/header/ColumnHeaderConstant.java
index 986d9be6c2..2b76fa13e5 100644
--- a/server/src/main/java/org/apache/iotdb/db/mpp/common/header/ColumnHeaderConstant.java
+++ b/server/src/main/java/org/apache/iotdb/db/mpp/common/header/ColumnHeaderConstant.java
@@ -118,7 +118,6 @@ public class ColumnHeaderConstant {
   public static final String DATA_NODE_ID = "DataNodeId";
   public static final String SERIES_SLOT_ID = "SeriesSlotId";
   public static final String TIME_SLOT_ID = "TimeSlotId";
-  public static final String SERIES_SLOT_NUM = "SeriesSlotNum";
   public static final String TIME_SLOT_NUM = "TimeSlotNum";
   public static final String ROLE = "Role";