remove these merge-tracking properties as they
authorGabor Greif <ggreif@gmail.com>
Fri, 2 Apr 2010 00:08:26 +0000 (00:08 +0000)
committerGabor Greif <ggreif@gmail.com>
Fri, 2 Apr 2010 00:08:26 +0000 (00:08 +0000)
might interfere with merges to other branches (as Dan pointed out)

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@100157 91177308-0d34-0410-b5e6-96231b3b80d8


No differences found