Bitbucket cannot automatically merge this request.
The commits that make up this pull request have been removed.
Bitbucket cannot automatically merge this request due to conflicts.
Review the conflicts on the Overview tab. You can then either decline the request or merge it manually on your local system using the following commands:
git checkout master
git merge --no-ff -m 'Merged in eschnett/no-openmp (pull request #18)' remotes/origin/eschnett/no-openmp
CarpetLib: Disable OpenMP parallelization of AMR and sync operators
Carpet: Make timer names more legible