Fix conflict caused by previous commit. Branch ------ V3_1_STABLE Details ------- http://git.postgresql.org/gitweb?p=pgpool2.git;a=commitdiff;h=d8f3918ae49cdcf3c0e624e04ab5178b9fef631f Modified Files -------------- doc/pgpool-ja.html | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-)