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 db950d81b83 Fix conflicts for licenses
db950d81b83 is described below
commit db950d81b830b791d9b550c1211627d08a6af94d
Author: Jinbao Chen <[email protected]>
AuthorDate: Tue Mar 10 22:19:20 2026 -0400
Fix conflicts for licenses
---
licenses/LICENSE-postgresql.txt | 6 +-----
1 file changed, 1 insertion(+), 5 deletions(-)
diff --git a/licenses/LICENSE-postgresql.txt b/licenses/LICENSE-postgresql.txt
index 7b191c61b31..be2d694b038 100644
--- a/licenses/LICENSE-postgresql.txt
+++ b/licenses/LICENSE-postgresql.txt
@@ -1,11 +1,7 @@
PostgreSQL Database Management System
(formerly known as Postgres, then as Postgres95)
-<<<<<<< HEAD:licenses/LICENSE-postgresql.txt
-Portions Copyright (c) 1996-2022, PostgreSQL Global Development Group
-=======
Portions Copyright (c) 1996-2025, PostgreSQL Global Development Group
->>>>>>> REL_16_9:COPYRIGHT
Portions Copyright (c) 1994, The Regents of the University of California
@@ -24,4 +20,4 @@ THE UNIVERSITY OF CALIFORNIA SPECIFICALLY DISCLAIMS ANY
WARRANTIES,
INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY
AND FITNESS FOR A PARTICULAR PURPOSE. THE SOFTWARE PROVIDED HEREUNDER IS
ON AN "AS IS" BASIS, AND THE UNIVERSITY OF CALIFORNIA HAS NO OBLIGATIONS TO
-PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS.
\ No newline at end of file
+PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS.
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
