Resolve rebase marker for narional languages

reshke · reshke · commit 42e5f1b2158b · 2025-12-24T10:48:49.000Z
xref: 88dad06
diff --git 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 \
