From: Wolfgang Bangerth Date: Fri, 31 Jul 2020 22:13:08 +0000 (-0600) Subject: Merge pull request #10769 from peterrum/simplex_grid_generator_namespace X-Git-Tag: v9.3.0-rc1~1235 X-Git-Url: https://gitweb.dealii.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=3b56b4b96a9dd879c02678c4a4e486ef31c0578e;p=dealii.git Merge pull request #10769 from peterrum/simplex_grid_generator_namespace Fix conflict with Simplex::GridGenerator --- 3b56b4b96a9dd879c02678c4a4e486ef31c0578e