]> https://gitweb.dealii.org/ - dealii.git/commit
Fix a merge conflict.
authorWolfgang Bangerth <bangerth@math.tamu.edu>
Fri, 28 Sep 2012 01:10:20 +0000 (01:10 +0000)
committerWolfgang Bangerth <bangerth@math.tamu.edu>
Fri, 28 Sep 2012 01:10:20 +0000 (01:10 +0000)
commita02557ebb33c6a3ab09f18d6753f639425aebc83
tree4f91622682a0841ddb1221ae3bb19f9d3caadf70
parent417beb5d9ed4b6b6625ee31bf4534f5b5bd4a949
Fix a merge conflict.

git-svn-id: https://svn.dealii.org/branches/branch_cmake@26816 0785d39b-7218-0410-832d-ea1e28bc413d
deal.II/include/deal.II/integrators/laplace.h

In the beginning the Universe was created. This has made a lot of people very angry and has been widely regarded as a bad move.

Douglas Adams


Typeset in Trocchi and Trocchi Bold Sans Serif.