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 af39d6d79fa Remove rebase markers from `contrib/auto_explain` (#1478)
af39d6d79fa is described below
commit af39d6d79fa8b535dd59cc62075831ae2d25d9ad
Author: reshke <[email protected]>
AuthorDate: Sat Dec 6 16:27:42 2025 +0500
Remove rebase markers from `contrib/auto_explain` (#1478)
---
contrib/auto_explain/auto_explain.c | 11 +++++------
1 file changed, 5 insertions(+), 6 deletions(-)
diff --git a/contrib/auto_explain/auto_explain.c
b/contrib/auto_explain/auto_explain.c
index 266d720d7b0..49c427b1a72 100644
--- a/contrib/auto_explain/auto_explain.c
+++ b/contrib/auto_explain/auto_explain.c
@@ -16,18 +16,17 @@
#include "access/parallel.h"
#include "commands/explain.h"
-<<<<<<< HEAD
-#include "cdb/cdbdisp.h"
-#include "cdb/cdbexplain.h"
-#include "cdb/cdbvars.h"
-=======
#include "common/pg_prng.h"
->>>>>>> REL_16_9
#include "executor/instrument.h"
#include "jit/jit.h"
#include "nodes/params.h"
#include "utils/guc.h"
+/* Cloubderry-related includes. */
+#include "cdb/cdbdisp.h"
+#include "cdb/cdbexplain.h"
+#include "cdb/cdbvars.h"
+
PG_MODULE_MAGIC;
/* GUC variables */
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
