]> https://gitweb.dealii.org/ - dealii-svn.git/commit
Fix a merge conflict.
authorbangerth <bangerth@0785d39b-7218-0410-832d-ea1e28bc413d>
Fri, 28 Sep 2012 01:10:20 +0000 (01:10 +0000)
committerbangerth <bangerth@0785d39b-7218-0410-832d-ea1e28bc413d>
Fri, 28 Sep 2012 01:10:20 +0000 (01:10 +0000)
commit63e01fb905e839b78d218c5ef286082509153298
tree9c6a921dbd566d49d632acfc80005617881b0cf4
parent30e3583045a5441a453a0244025406cd7fe851cd
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.