fix another svn merge bug

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

diff --git a/res/res_config_pgsql.c b/res/res_config_pgsql.c
index ecdce4d..61046c8 100644 (file)
--- a/res/res_config_pgsql.c
+++ b/res/res_config_pgsql.c
@@ -709,11 +709,7 @@ static int usecount(void)
        return 0;
 }
 
-<<<<<<< .mine
 static const char *key(void)
-=======
-const char *key(void)
->>>>>>> .r19220
 {
        return ASTERISK_GPL_KEY;
 }