901d4995e3
Fix a typo error Conflicts: modules/features2d/include/opencv2/features2d.hpp
Fix a typo error Conflicts: modules/features2d/include/opencv2/features2d.hpp