]> https://gitweb.dealii.org/ - dealii-svn.git/commit
Fix accidentally commited merge conflict
authormaier <maier@0785d39b-7218-0410-832d-ea1e28bc413d>
Tue, 25 Sep 2012 22:19:39 +0000 (22:19 +0000)
committermaier <maier@0785d39b-7218-0410-832d-ea1e28bc413d>
Tue, 25 Sep 2012 22:19:39 +0000 (22:19 +0000)
commit0a4ef874dee6ea3f219560be43e8afc92a530332
tree8a3e5bb76d32d3a1b8f0e4011d7f9a645729d879
parent5c87aa21f90f8e258bdc70caa25bf482b7fed8df
Fix accidentally commited merge conflict

git-svn-id: https://svn.dealii.org/branches/branch_cmake@26741 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.