Whoops, fixed bad merge
authorMichael Ilseman <milseman@apple.com>
Wed, 28 Nov 2012 21:21:18 +0000 (21:21 +0000)
committerMichael Ilseman <milseman@apple.com>
Wed, 28 Nov 2012 21:21:18 +0000 (21:21 +0000)
commit37018f832273b28aa012c1f950c6af8e3ec2050f
tree74b97df255321e5d42cf1872c591864f3044ef22
parent1833e000a3a50463b8c0ede48c378b30e706dcec
Whoops, fixed bad merge

llvm-svn: 168816
llvm/unittests/VMCore/IRBuilderTest.cpp