]> https://gitweb.dealii.org/ - dealii.git/commit
Fix accidentally commited merge conflict
authorMatthias Maier <tamiko@kyomu.43-1.org>
Tue, 25 Sep 2012 22:19:39 +0000 (22:19 +0000)
committerMatthias Maier <tamiko@kyomu.43-1.org>
Tue, 25 Sep 2012 22:19:39 +0000 (22:19 +0000)
commit664107b4545f67e88482d9bae7bc723c26c1c3c4
treeff0c0ef664ab7c94d3ff891ce9c07567cbfb59b0
parenteae5462e742303112f2d06c9b047c625d5e7597f
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.