From: Jason Parker <jparker@digium.com>
Date: Tue, 10 Jul 2007 15:41:26 +0000 (+0000)
Subject: svn revert != svn resolved
X-Git-Tag: 1.6.0-beta1~3^2~2101
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=7c6424be53ffba325fa13be436a86ec2c8eb94ef;p=thirdparty%2Fasterisk.git

svn revert != svn resolved

Fix merged property...


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