When resolving a merge conflict, I put something inside an #ifdef. Fixed.
authorMarshall Clow <mclow.lists@gmail.com>
Fri, 14 Dec 2018 19:25:22 +0000 (19:25 +0000)
committerMarshall Clow <mclow.lists@gmail.com>
Fri, 14 Dec 2018 19:25:22 +0000 (19:25 +0000)
commitcac3d118ae775647f432c2d0159eca562c486744
treeda15120620bc2f79bd82f7c8fdf048920695683f
parent82694abac725612258640e17d9dd1b635c704ceb
When resolving a merge conflict, I put something inside an #ifdef. Fixed.

llvm-svn: 349181
libcxx/include/version