Commit9295350

committed

resolve conflicts caused by merge of branch 'rel_1_2_beta'

2 parents01ef629 +7d81364 commit9295350Copy full SHA for 9295350

File tree

+2070

-891

lines changed

+2070

-891

lines changed

Lines changed: 2 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -5,7 +5,8 @@ OBJS = src/init.o src/relation_info.o src/utils.o src/partition_filter.o \`
`5`	`5`	`src/runtimeappend.o src/runtime_merge_append.o src/pg_pathman.o src/rangeset.o\`
`6`	`6`	`src/pl_funcs.o src/pl_range_funcs.o src/pl_hash_funcs.o src/pathman_workers.o\`
`7`	`7`	`src/hooks.o src/nodes_common.o src/xact_handling.o src/utility_stmt_hooking.o\`
`8`		`-src/planner_tree_modification.o src/debug_print.o src/pg_compat.o$(WIN32RES)`
	`8`	`+src/planner_tree_modification.o src/debug_print.o src/pg_compat.o\`
	`9`	`+src/partition_creation.o$(WIN32RES)`
`9`	`10`
`10`	`11`	`EXTENSION = pg_pathman`
`11`	`12`	`EXTVERSION = 1.1`

Comments

(0)