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 cd038134caf Fix conflict for foreign
cd038134caf is described below
commit cd038134cafb2a6b4f801f890748cc174af63a30
Author: Jinbao Chen <[email protected]>
AuthorDate: Fri Jul 18 13:20:38 2025 +0800
Fix conflict for foreign
---
src/backend/foreign/foreign.c | 3 ---
1 file changed, 3 deletions(-)
diff --git a/src/backend/foreign/foreign.c b/src/backend/foreign/foreign.c
index 9b28cf2bc94..4e5e9a05896 100644
--- a/src/backend/foreign/foreign.c
+++ b/src/backend/foreign/foreign.c
@@ -29,15 +29,12 @@
#include "funcapi.h"
#include "lib/stringinfo.h"
#include "miscadmin.h"
-<<<<<<< HEAD
#include "optimizer/optimizer.h"
#include "optimizer/pathnode.h"
#include "optimizer/planmain.h"
#include "optimizer/restrictinfo.h"
#include "optimizer/tlist.h"
-=======
#include "tcop/tcopprot.h"
->>>>>>> REL_16_9
#include "utils/builtins.h"
#include "utils/memutils.h"
#include "utils/rel.h"
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
