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
..
2020-12-08 19:26:30 +01:00
2021-04-06 14:50:17 +08:00
2020-12-31 09:45:41 +01:00
2020-12-31 09:45:41 +01:00
2021-03-17 17:59:22 -07:00
2021-03-17 17:59:22 -07:00
2020-12-31 09:45:41 +01:00
2021-01-04 12:31:31 +08:00
2021-01-04 12:23:16 +08:00
2020-12-31 09:45:41 +01:00
2021-01-04 12:23:16 +08:00
2021-01-07 18:07:09 +02:00
2021-01-04 12:31:31 +08:00
2021-04-01 11:35:27 +01:00
2021-04-06 14:50:17 +08:00
2020-12-31 09:45:41 +01:00
2020-12-31 09:45:41 +01:00
2020-12-31 09:45:41 +01:00
2021-01-13 02:05:00 +01:00
2021-03-11 13:45:14 +08:00
2021-03-18 18:43:52 +01:00