fix another svn merge bug

git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@20076 65c4cc65-6c06-0410-ace0-fbb531ad65f3
1.4
Luigi Rizzo 19 years ago
parent b8317169d0
commit 8d98d44e82

@ -709,11 +709,7 @@ static int usecount(void)
return 0; return 0;
} }
<<<<<<< .mine
static const char *key(void) static const char *key(void)
=======
const char *key(void)
>>>>>>> .r19220
{ {
return ASTERISK_GPL_KEY; return ASTERISK_GPL_KEY;
} }

Loading…
Cancel
Save