diff options
| author | jpeeler <jpeeler@f38db490-d61c-443f-a65b-d21fe96a405b> | 2009-02-12 20:59:09 +0000 |
|---|---|---|
| committer | jpeeler <jpeeler@f38db490-d61c-443f-a65b-d21fe96a405b> | 2009-02-12 20:59:09 +0000 |
| commit | 685e6ddf9fe0b1fea27458787ac3d6885d87e1dd (patch) | |
| tree | 041bbff1f8b5baf1ed48533a028a55197be906b4 /main/features.c | |
| parent | a505ab928fa1d9c0f4f7c02c5ac3a6ccdd5b30f3 (diff) | |
Fix mistake in merging conflict from 175299.
git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.0@175301 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'main/features.c')
| -rw-r--r-- | main/features.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/main/features.c b/main/features.c index a84dfc8b2..d1dfcba7f 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, "<unknown>"), S_OR(pu->chan->cid.cid_name, "<unknown>"), |