fix another svn merge bug

git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@20076 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2006-04-14 18:45:08 +00:00 · 2006-04-14 18:45:08 +00:00 · 8d98d44e82
parent b8317169d0
commit 8d98d44e82
1 changed files with 0 additions and 4 deletions
--- 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;
 }