[asterisk-commits] trunk r20076 - /trunk/res/res_config_pgsql.c

[asterisk-commits at lists.digium.com]

Author: rizzo
Date: Fri Apr 14 13:45:08 2006
New Revision: 20076

URL: http://svn.digium.com/view/asterisk?rev=20076&view=rev
Log:
fix another svn merge bug


Modified:
    trunk/res/res_config_pgsql.c

Modified: trunk/res/res_config_pgsql.c
URL: http://svn.digium.com/view/asterisk/trunk/res/res_config_pgsql.c?rev=20076&r1=20075&r2=20076&view=diff
==============================================================================
--- trunk/res/res_config_pgsql.c (original)
+++ trunk/res/res_config_pgsql.c Fri Apr 14 13:45:08 2006
@@ -709,11 +709,7 @@
 	return 0;
 }
 
-<<<<<<< .mine
 static const char *key(void)
-=======
-const char *key(void)
->>>>>>> .r19220
 {
 	return ASTERISK_GPL_KEY;
 }