[asterisk-commits] jpeeler: branch 1.6.0 r175301 - /branches/1.6.0/main/features.c

[SVN commits to the Asterisk project]

Author: jpeeler
Date: Thu Feb 12 14:59:09 2009
New Revision: 175301

URL: http://svn.digium.com/svn-view/asterisk?view=rev&rev=175301
Log:
Fix mistake in merging conflict from 175299.

Modified:
    branches/1.6.0/main/features.c

Modified: branches/1.6.0/main/features.c
URL: http://svn.digium.com/svn-view/asterisk/branches/1.6.0/main/features.c?view=diff&rev=175301&r1=175300&r2=175301
==============================================================================
--- branches/1.6.0/main/features.c (original)
+++ branches/1.6.0/main/features.c Thu Feb 12 14:59:09 2009
@@ -570,7 +570,7 @@
 		"CallerIDNum: %s\r\n"
 		"CallerIDName: %s\r\n"
 		"Uniqueid: %s\r\n",
-		pu->parkingexten, pu->chan->name, pu->parkinglot->name, event_from ? event_from : "",
+		pu->parkingexten, pu->chan->name, event_from ? event_from : "",
 		(long)pu->start.tv_sec + (long)(pu->parkingtime/1000) - (long)time(NULL),
 		S_OR(pu->chan->cid.cid_num, "<unknown>"),
 		S_OR(pu->chan->cid.cid_name, "<unknown>"),