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)
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


No differences found