Skip to content
Snippets Groups Projects
  • Kinsey Moore's avatar
    6851801a
    Resolve a merge conflict · 6851801a
    Kinsey Moore authored
    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
    6851801a
    History
    Resolve a merge conflict
    Kinsey Moore authored
    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