W. J. van der Laan e5faec65bd doc: Fix doxygen comment silent merge conflict in descriptor.cpp
It looks like #21238 introduced a silent merge conflict in the
documentation, which fails with `-Wdocumentation` in the CI.
2021-04-20 09:29:43 +02:00
..
2021-04-06 14:50:17 +08:00
2021-04-01 11:35:27 +01:00
2021-04-06 14:50:17 +08:00