Skip to content
Snippets Groups Projects
Commit 094a5b29 authored by BJ Weschke's avatar BJ Weschke
Browse files

Remove the svnmerge-integrated property accidentally merged in from the... 

 Remove the svnmerge-integrated property accidentally merged in from the func_realtime branch merge last night.



git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@24380 65c4cc65-6c06-0410-ace0-fbb531ad65f3
parent 0abc9b0b
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.
Finish editing this message first!
Please register or to comment