diff options
| author | rizzo <rizzo@f38db490-d61c-443f-a65b-d21fe96a405b> | 2006-04-14 18:45:08 +0000 |
|---|---|---|
| committer | rizzo <rizzo@f38db490-d61c-443f-a65b-d21fe96a405b> | 2006-04-14 18:45:08 +0000 |
| commit | 607b2b6a47f8f18d17c69bd07f1d24a8e5fcdb40 (patch) | |
| tree | 39a27830898dd21b883a1ebd0a701f4a30ffad42 /res/res_config_pgsql.c | |
| parent | 0d933f8a058fee47c46a03eb4eddae7f73df0519 (diff) | |
fix another svn merge bug
git-svn-id: http://svn.digium.com/svn/asterisk/trunk@20076 f38db490-d61c-443f-a65b-d21fe96a405b
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; } |