[pgpool-committers: 2646] pgpool: Fix conflicts of documents

[Yugo Nagata]

Fix conflicts of documents

These were caused by some old commits but not resolved.

Branch
------
V3_1_STABLE

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

Modified Files
--------------
doc/pgpool-en.html |   41 -----------------------------------------
doc/pgpool-ja.html |   15 ---------------
2 files changed, 56 deletions(-)