Update TableProperty.java

Signed-off-by: meegoo <[email protected]>
StarRocks · Sep 20, 2024 · a6771ae · a6771ae
1 parent 2a984ac
commit a6771ae
Showing 1 changed file with 0 additions and 3 deletions.
diff --git a/fe/fe-core/src/main/java/com/starrocks/catalog/TableProperty.java b/fe/fe-core/src/main/java/com/starrocks/catalog/TableProperty.java
@@ -47,11 +47,8 @@
 import com.starrocks.catalog.constraint.ForeignKeyConstraint;
 import com.starrocks.catalog.constraint.UniqueConstraint;
 import com.starrocks.common.Config;
-<<<<<<< HEAD
 import com.starrocks.common.FeConstants;
-=======
 import com.starrocks.common.Pair;
->>>>>>> 99b2440f02 ([BugFix] Fix partition ttl loss after FE restart (#51028))
 import com.starrocks.common.io.Text;
 import com.starrocks.common.io.Writable;
 import com.starrocks.common.util.PropertyAnalyzer;