Merge pull request #35 from peterrum/ca_pft_mf

author Wolfgang Bangerth <bangerth@colostate.edu>

Thu, 14 May 2020 19:38:20 +0000 (21:38 +0200)

committer GitHub <noreply@github.com>

Thu, 14 May 2020 19:38:20 +0000 (21:38 +0200)
author Wolfgang Bangerth <bangerth@colostate.edu>
Thu, 14 May 2020 19:38:20 +0000 (21:38 +0200)
committer GitHub <noreply@github.com>
Thu, 14 May 2020 19:38:20 +0000 (21:38 +0200)
diff --cc 9.2/paper.tex

index 67839d239661f869ab0f76d317a9141210e68656,aa6080b6d24486a7469af01329c8a594cd2fbef1..27f67536b84c710aba7b1da89d098f475537742c
--- 1/9.2/paper.tex
--- 2/9.2/paper.tex
+++ b/9.2/paper.tex
@@@ -45,8 -47,9 +47,9 @@@
       Timo Heister,
   %     Luca Heltai,
       Martin Kronbichler,
+     Peter Munch,
   %     Ross Maguire Kynch,
- -%     Matthias Maier,
+ +    Matthias Maier,
   %     Jean-Paul Pelteret,
   %     Bruno Turcksin,
   %     David Wells
author	Wolfgang Bangerth <bangerth@colostate.edu>
	Thu, 14 May 2020 19:38:20 +0000 (21:38 +0200)
committer	GitHub <noreply@github.com>
	Thu, 14 May 2020 19:38:20 +0000 (21:38 +0200)