Skip to content
Snippets Groups Projects
Commit 445abea0 authored by Joshua Colp's avatar Joshua Colp
Browse files

No more conflicts on properties! svnmerge-block be gone! 

git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@51515 65c4cc65-6c06-0410-ace0-fbb531ad65f3
parent fa6d3941
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
No files found.
with 0 additions and 0 deletions
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment