4efd36e
for some reason one of the merges resulted in a duplicated with_doxygen conditional path; excising it