merge conflict resolution

6 jobs for 44-implement-babuska-problem in 25 minutes and 6 seconds (queued for 6 seconds)
Status Name Job ID Coverage
  Build
passed build-mluq #505715
docker

00:12:14

 
  Test
passed ctest-mluq #505716
docker

00:07:01

passed mpitest-1-mluq #505717
docker

00:05:54

passed mpitest-2-mluq #505718
docker

00:06:49

passed mpitest-4-mluq #505719
docker

00:01:16

passed mpitest-8-mluq #505720
docker

00:01:00