kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-09-05 20:20:07 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix another svn merge bug

Browse Source 
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@20076 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Luigi Rizzo
2006-04-14 18:45:08 +00:00
parent b8317169d0
commit 8d98d44e82
1 changed files with 0 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
res/res_config_pgsql.c
View File

@@ -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;
}