fix another svn merge bug
authorLuigi Rizzo <rizzo@icir.org>
Fri, 14 Apr 2006 18:45:08 +0000 (18:45 +0000)
committerLuigi Rizzo <rizzo@icir.org>
Fri, 14 Apr 2006 18:45:08 +0000 (18:45 +0000)
commit8d98d44e825d951d40b414654345242d79b6e9f3
tree39a27830898dd21b883a1ebd0a701f4a30ffad42
parentb8317169d04005378071c629bc8c8897ba112934
fix another svn merge bug

git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@20076 65c4cc65-6c06-0410-ace0-fbb531ad65f3
res/res_config_pgsql.c