[pgpool-committers: 2647] pgpool: Fix conflicts in documents

[Yugo Nagata]

Fix conflicts in documents

These were caused by some old commits but not resolved.

Branch
------
V3_0_STABLE

Details
-------
http://git.postgresql.org/gitweb?p=pgpool2.git;a=commitdiff;h=9dc737e08d1355c57b281a74af57575d30a85a56

Modified Files
--------------
doc/pgpool-en.html |  157 ++++++++++------------------------------------------
doc/pgpool-ja.html |   98 ++++++--------------------------
2 files changed, 45 insertions(+), 210 deletions(-)