From: Luigi Rizzo <rizzo@icir.org>
Date: Fri, 14 Apr 2006 18:45:08 +0000 (+0000)
Subject: fix another svn merge bug
X-Git-Tag: 1.4.0-beta1~1976
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=8d98d44e825d951d40b414654345242d79b6e9f3;p=thirdparty%2Fasterisk.git

fix another svn merge bug



git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@20076 65c4cc65-6c06-0410-ace0-fbb531ad65f3
---

diff --git a/res/res_config_pgsql.c b/res/res_config_pgsql.c
index ecdce4dd17..61046c84bb 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;
 }