Skip to content
Snippets Groups Projects
Commit 4ee62f1b authored by Kevin P. Fleming's avatar Kevin P. Fleming
Browse files

be more careful when merging in a branch with automerge properties :-( 

git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@16521 65c4cc65-6c06-0410-ace0-fbb531ad65f3
parent 03ce34e1
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