tree a6d7d0604918954b38bf4c8d0812bef02524af1a
parent 9626b8d4ee5c7c80e6c3962f224fbe12689de975
author Faisal Vali <faisalv@yahoo.com> 1524704705 +0000
committer Faisal Vali <faisalv@yahoo.com> 1524704705 +0000

Fix a merge conflict that was inadvertently introduced in r330888 
- during the reversion of r330794

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