Commit86c9561

committed

Fix lost confilct artefact

1 parent23802e2 commit86c9561Copy full SHA for 86c9561

File tree

-1

lines changed

-1

lines changed

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -577,7 +577,7 @@`
`577`	`577`	`#define PGPRO_VERSION "9.6.4.1"`
`578`	`578`
`579`	`579`	`#define PGPRO_PACKAGE_STR "PostgresPro 9.6.4.1"`
`580`		`-=======`
	`580`	`+`
`581`	`581`	`#define PG_VERSION_NUM 90604`
`582`	`582`
`583`	`583`	`/* Define to the one symbol short name of this package. */`

Comments

(0)