Closed dzenanz closed 4 days ago
I think we will need to ignore ghostflow's complaints this time. This is ready for review/merge. The only file with manually resolved merge conflicts (https://github.com/InsightSoftwareConsortium/ITK/blob/d600679b63d30bb0e5f2236952076b9cb20fca41/Modules/ThirdParty/ZLIB/src/itkzlib-ng/CMakeLists.txt) is the one to look at. It is hard to look at the right diff from the GitHub UI. Searching for # ITK change
can narrow down the focus.
PR Checklist