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

Browse Source

git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@51515 65c4cc65-6c06-0410-ace0-fbb531ad65f3

...

This commit is contained in:

Joshua Colp

2007-01-23 01:51:22 +00:00

parent fa6d3941df

commit 445abea012

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files

Diff Content Not Available