]> https://gitweb.dealii.org/ - dealii.git/commitdiff
Remove errant line left over from a merge conflict. 1868/head
authorJean-Paul Pelteret <jppelteret@gmail.com>
Fri, 13 Nov 2015 14:03:00 +0000 (15:03 +0100)
committerJean-Paul Pelteret <jppelteret@gmail.com>
Fri, 13 Nov 2015 14:07:56 +0000 (15:07 +0100)
include/deal.II/lac/precondition_selector.h

index aa1f548aaa4c30e8bb2a21f404db1cb682101457..164018c81dec1dcd0ce0e6fa50012eb96880711b 100644 (file)
@@ -205,7 +205,6 @@ void PreconditionSelector<MatrixType,VectorType>::use_matrix(const MatrixType &M
   A=&M;
 }
 
-<<<<<<< fc87b7c22812a5fc7751b36c66b20e6fa54df72c
 
 template <typename MatrixType, typename VectorType>
 inline typename PreconditionSelector<MatrixType,VectorType>::size_type

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.