(gravitino) branch cherry-pick-d8fb60ba-to-branch-1.3 updated: Resolve cherry-pick conflict in IcebergCatalogWrapper imports

[yuqi4733]

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

yuqi1129 pushed a commit to branch cherry-pick-d8fb60ba-to-branch-1.3
in repository https://gitbox.apache.org/repos/asf/gravitino.git


The following commit(s) were added to 
refs/heads/cherry-pick-d8fb60ba-to-branch-1.3 by this push:
     new d3ca29fcb5 Resolve cherry-pick conflict in IcebergCatalogWrapper 
imports
d3ca29fcb5 is described below

commit d3ca29fcb552a339ba7289c487e3ff1827a198a1
Author: yuqi <y...@datastrato.com>
AuthorDate: Mon Oct 19 14:46:15 2026 +0800

    Resolve cherry-pick conflict in IcebergCatalogWrapper imports
---
 .../apache/gravitino/iceberg/common/ops/IcebergCatalogWrapper.java    | 4 ----
 1 file changed, 4 deletions(-)

diff --git 
a/iceberg/iceberg-common/src/main/java/org/apache/gravitino/iceberg/common/ops/IcebergCatalogWrapper.java
 
b/iceberg/iceberg-common/src/main/java/org/apache/gravitino/iceberg/common/ops/IcebergCatalogWrapper.java
index 69c0a86712..2b122ab49d 100644
--- 
a/iceberg/iceberg-common/src/main/java/org/apache/gravitino/iceberg/common/ops/IcebergCatalogWrapper.java
+++ 
b/iceberg/iceberg-common/src/main/java/org/apache/gravitino/iceberg/common/ops/IcebergCatalogWrapper.java
@@ -48,11 +48,7 @@ import org.apache.iceberg.catalog.Namespace;
 import org.apache.iceberg.catalog.SupportsNamespaces;
 import org.apache.iceberg.catalog.TableIdentifier;
 import org.apache.iceberg.catalog.ViewCatalog;
-<<<<<<< HEAD
-=======
-import org.apache.iceberg.exceptions.NoSuchTableException;
 import org.apache.iceberg.exceptions.NoSuchViewException;
->>>>>>> d8fb60ba3 ([#13895] fix(iceberg): report missing views after native 
rename (#13896))
 import org.apache.iceberg.io.FileIO;
 import org.apache.iceberg.io.ResolvingFileIO;
 import org.apache.iceberg.jdbc.JdbcCatalogWithMetadataLocationSupport;