From 8008dca29dc5da5d772977023fa783b77f93a8ed Mon Sep 17 00:00:00 2001 From: Jeff Peeler Date: Thu, 12 Feb 2009 20:59:09 +0000 Subject: [PATCH] Fix mistake in merging conflict from 175299. git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@175301 65c4cc65-6c06-0410-ace0-fbb531ad65f3 --- main/features.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/main/features.c b/main/features.c index a84dfc8b2d..d1dfcba7f6 100644 --- a/main/features.c +++ b/main/features.c @@ -570,7 +570,7 @@ static int park_call_full(struct ast_channel *chan, struct ast_channel *peer, in "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, ""), S_OR(pu->chan->cid.cid_name, ""),