diff options
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; } |