mirror of
https://github.com/Kitware/CMake.git
synced 2026-05-21 15:28:41 -05:00
e9bc469b2a
Resolve conflicts in C code by taking their side. Resolve conflicts in CMake code by integrating the changes.