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 42e5f1b2158 Resolve rebase marker for narional languages
42e5f1b2158 is described below
commit 42e5f1b2158b44d8112331cac2957346b267a275
Author: reshke <[email protected]>
AuthorDate: Wed Dec 24 10:48:45 2025 +0000
Resolve rebase marker for narional languages
xref: 88dad06b47eb80f699211c9b0b7a1c6d9016ad19
---
src/bin/pg_dump/nls.mk | 4 ----
1 file changed, 4 deletions(-)
diff --git a/src/bin/pg_dump/nls.mk b/src/bin/pg_dump/nls.mk
index 90837a89f33..cd91737f488 100644
--- a/src/bin/pg_dump/nls.mk
+++ b/src/bin/pg_dump/nls.mk
@@ -1,9 +1,5 @@
# src/bin/pg_dump/nls.mk
CATALOG_NAME = pg_dump
-<<<<<<< HEAD
-AVAIL_LANGUAGES = cs de el es fr ja ko ru sv tr uk zh_CN
-=======
->>>>>>> REL_16_9
GETTEXT_FILES = $(FRONTEND_COMMON_GETTEXT_FILES) \
pg_backup_archiver.c \
pg_backup_db.c \
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
