This is an automated email from the ASF dual-hosted git repository.
reshke pushed a commit to branch cbdb-postgres-merge
in repository https://gitbox.apache.org/repos/asf/cloudberry.git
The following commit(s) were added to refs/heads/cbdb-postgres-merge by this
push:
new c85726bd29a Resolve typedef rebase marker
c85726bd29a is described below
commit c85726bd29a8fad12df3a1ef7a8cf5047d31e777
Author: reshke <[email protected]>
AuthorDate: Tue Dec 23 18:02:32 2025 +0000
Resolve typedef rebase marker
---
src/tools/pgindent/typedefs.list | 3 ---
1 file changed, 3 deletions(-)
diff --git a/src/tools/pgindent/typedefs.list b/src/tools/pgindent/typedefs.list
index e5f41000761..0752fbae927 100644
--- a/src/tools/pgindent/typedefs.list
+++ b/src/tools/pgindent/typedefs.list
@@ -85,11 +85,8 @@ AlterOpFamilyStmt
AlterOperatorStmt
AlterOwnerStmt
AlterPolicyStmt
-<<<<<<< HEAD
AlterProfileStmt
-=======
AlterPublicationAction
->>>>>>> REL_16_9
AlterPublicationStmt
AlterRoleSetStmt
AlterRoleStmt
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
