]> https://gitweb.dealii.org/ - dealii-svn.git/commit
Fix merge conflict.
authorbangerth <bangerth@0785d39b-7218-0410-832d-ea1e28bc413d>
Wed, 27 Mar 2013 22:12:06 +0000 (22:12 +0000)
committerbangerth <bangerth@0785d39b-7218-0410-832d-ea1e28bc413d>
Wed, 27 Mar 2013 22:12:06 +0000 (22:12 +0000)
commit6bb382e8fb07c2d0cddecc36bd7ace7b3dea1ab0
tree26e7bea74f6d2f235ce19e5bc5c0abf7d87edf20
parent0175ab989f23907fd8ab79c983f962fe0c622f8a
Fix merge conflict.

git-svn-id: https://svn.dealii.org/branches/branch_bigger_global_dof_indices_4@29092 0785d39b-7218-0410-832d-ea1e28bc413d
deal.II/include/deal.II/lac/trilinos_vector_base.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.