This is an automated email from the ASF dual-hosted git repository.
chenjinbao1989 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 77c8b054a46 Fix conflicts for read.c
77c8b054a46 is described below
commit 77c8b054a469336edd4858cbb922b6986aec17eb
Author: Jinbao Chen <[email protected]>
AuthorDate: Tue Mar 10 21:13:55 2026 -0400
Fix conflicts for read.c
---
src/backend/nodes/read.c | 4 ----
1 file changed, 4 deletions(-)
diff --git a/src/backend/nodes/read.c b/src/backend/nodes/read.c
index dd60079d227..2cd0ced930e 100644
--- a/src/backend/nodes/read.c
+++ b/src/backend/nodes/read.c
@@ -4,13 +4,9 @@
* routines to convert a string (legal ascii representation of node) back
* to nodes
*
-<<<<<<< HEAD
* Portions Copyright (c) 2006-2008, Greenplum inc
* Portions Copyright (c) 2012-Present VMware, Inc. or its affiliates.
- * Portions Copyright (c) 1996-2021, PostgreSQL Global Development Group
-=======
* Portions Copyright (c) 1996-2023, PostgreSQL Global Development Group
->>>>>>> REL_16_9
* Portions Copyright (c) 1994, Regents of the University of California
*
*
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
