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)
commit3d15a91777285782d94288707f5a2ecc988f2dc6
tree5f3f2bd1b9bd2d826097cb681427f8a46e180bdd
parent9eec6599521ba64e59da4a5e5fdc79ba6964dbc6
Whoops, fixed bad merge

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@168816 91177308-0d34-0410-b5e6-96231b3b80d8
unittests/VMCore/IRBuilderTest.cpp