mirror of
https://github.com/Kitware/CMake.git
synced 2026-05-01 20:00:51 -05:00
027a0201b2
Resolve conflict in Source/cmTestGenerator.cxx by taking "their" side (test-property-genex). It already accounts for the lower-case change in "our" side (generate-modern-style).
6.5 KiB
6.5 KiB