[pgpool-committers: 1578] pgpool: Fix conflict caused by previous commit.

[Tatsuo Ishii]

Fix conflict caused by previous commit.

Branch
------
V3_1_STABLE

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

Modified Files
--------------
doc/pgpool-en.html |  131 +++++++++++++++++++++++-----------------------------
1 file changed, 59 insertions(+), 72 deletions(-)