diff options
author | Luigi Rizzo <rizzo@icir.org> | 2006-04-14 18:45:08 +0000 |
---|---|---|
committer | Luigi Rizzo <rizzo@icir.org> | 2006-04-14 18:45:08 +0000 |
commit | 8d98d44e825d951d40b414654345242d79b6e9f3 (patch) | |
tree | 39a27830898dd21b883a1ebd0a701f4a30ffad42 /res/res_config_pgsql.c | |
parent | b8317169d04005378071c629bc8c8897ba112934 (diff) |
fix another svn merge bug
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@20076 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'res/res_config_pgsql.c')
-rw-r--r-- | res/res_config_pgsql.c | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/res/res_config_pgsql.c b/res/res_config_pgsql.c index ecdce4dd1..61046c84b 100644 --- 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; } |