Remove stray properties from merge.

Browse Source

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

changes/78/78/1

Mark Michelson 12 years ago

parent 4710869133

commit 463470bb6e

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

Show Stats Download Patch File Download Diff File

Diff Content Not Available