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

morningman pushed a commit to branch branch-1.2-lts
in repository https://gitbox.apache.org/repos/asf/doris.git


The following commit(s) were added to refs/heads/branch-1.2-lts by this push:
     new 0c9fccf6e0 [branch-1.2](test) fix iceberg p2 test
0c9fccf6e0 is described below

commit 0c9fccf6e05cd4f18542d151110f925044253f1a
Author: morningman <[email protected]>
AuthorDate: Fri Feb 24 14:05:21 2023 +0800

    [branch-1.2](test) fix iceberg p2 test
---
 .../iceberg/test_external_catalog_icebergv2.out          | 16 ----------------
 1 file changed, 16 deletions(-)

diff --git 
a/regression-test/data/external_table_emr_p2/iceberg/test_external_catalog_icebergv2.out
 
b/regression-test/data/external_table_emr_p2/iceberg/test_external_catalog_icebergv2.out
index efb71b3862..e7158ffd36 100644
--- 
a/regression-test/data/external_table_emr_p2/iceberg/test_external_catalog_icebergv2.out
+++ 
b/regression-test/data/external_table_emr_p2/iceberg/test_external_catalog_icebergv2.out
@@ -30,11 +30,7 @@
 5908.20
 
 -- !q08 --
-<<<<<<< HEAD
 120001848
-=======
-1499999990
->>>>>>> 3ff01ca799 ([feature-wip](multi-catalog) support Iceberg time travel 
in external table (#15418))
 
 -- !q09 --
 1
@@ -42,15 +38,9 @@
 3
 
 -- !q10 --
-<<<<<<< HEAD
 150000000
 149999999
 149999996
-=======
-2
-3
-4
->>>>>>> 3ff01ca799 ([feature-wip](multi-catalog) support Iceberg time travel 
in external table (#15418))
 
 -- !q11 --
 1
@@ -58,13 +48,7 @@
 3
 
 -- !q12 --
-<<<<<<< HEAD
 150000000
 149999999
 149999996
 
-=======
-2
-3
-4
->>>>>>> 3ff01ca799 ([feature-wip](multi-catalog) support Iceberg time travel 
in external table (#15418))


---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]

Reply via email to