Resolve a merge conflict
authorKinsey Moore <kmoore@digium.com>
Wed, 29 May 2013 02:26:17 +0000 (02:26 +0000)
committerKinsey Moore <kmoore@digium.com>
Wed, 29 May 2013 02:26:17 +0000 (02:26 +0000)
commit6851801a5ebcb0fc7cdf20c14a68e96e67d7f96e
tree271a81f5970dd968cc4815205717daaaafcb529c
parentbb584c55dee3fbe1bd6d4ecffdfff2c74733cc65
Resolve a merge conflict

When ast_channel_cached_blob_create was merged,
ast_channel_blob_create_from_cache was partially removed in an
unresolved merge conflict. This restores ast_channel_blob_create_from_cache
and refactors usage of ast_channel_cached_blob_create (requires an
ast_channel) to use ast_channel_blob_create_from_cache (requires a
channel uniqueid) instead.

git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@389974 65c4cc65-6c06-0410-ace0-fbb531ad65f3
apps/app_fax.c
include/asterisk/stasis_channels.h
main/stasis_channels.c
res/res_fax.c
res/res_monitor.c
res/res_musiconhold.c