Remove duplicate conflicts info
authorCraig Ringer <craig@2ndquadrant.com>
Fri, 19 Jun 2015 03:27:22 +0000 (11:27 +0800)
committerCraig Ringer <craig@2ndquadrant.com>
Fri, 19 Jun 2015 03:27:22 +0000 (11:27 +0800)
commit6e931dbde0dbed2b69b135f01730919662fd8d1c
treea1decea1d433fa18721f065bd075351d3b0629f0
parentd28cfc5289c04beb95540492b55fc7ab69ffdb31
Remove duplicate conflicts info
doc/manual-conflicts.sgml