Check if 'get_merge_type' can have OCLint tag removed

[richelbilderbeek]

Is your feature request related to a problem? Please describe.

Currently, there is:

std::vector<tile_type> get_merge_type(tile_type type1, tile_type type2) noexcept //!OCLINT must be simpler

As the get_merge_type function has been simplified recently, maybe the OCLint tag can be removed.

Describe the solution you'd like

• [x] Remove the //!OCLINT must be simpler
• [x] Push
• [ ] If Travis fails, put back the OCLint line and instead if 'must be simpler', use the OCLint error message.
• [x] If Travis passes, close this Issue

Describe alternatives you've considered

None.

Additional context

On a Linux computer, one can just run ./do_oclint.