[pgpool-committers: 1576] 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=0538f3c80903843420b60d34e91f08fe034c9d74

Modified Files
--------------
doc/pgpool-ja.html |   18 +-----------------
1 file changed, 1 insertion(+), 17 deletions(-)