svn revert != svn resolved
authorJason Parker <jparker@digium.com>
Tue, 10 Jul 2007 15:41:26 +0000 (15:41 +0000)
committerJason Parker <jparker@digium.com>
Tue, 10 Jul 2007 15:41:26 +0000 (15:41 +0000)
commit7c6424be53ffba325fa13be436a86ec2c8eb94ef
tree9d2aca8a8dc1e9acc7a6300a4aa1b9278a736bab
parent2600cd5d7b60dd3bc3e0ea3f2407152d28b9f3dd
svn revert != svn resolved

Fix merged property...

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