Remove errant line left over from a merge conflict.

diff --git a/include/deal.II/lac/precondition_selector.h b/include/deal.II/lac/precondition_selector.h
index aa1f548aaa4c30e8bb2a21f404db1cb682101457..164018c81dec1dcd0ce0e6fa50012eb96880711b 100644 (file)
--- a/include/deal.II/lac/precondition_selector.h
+++ b/include/deal.II/lac/precondition_selector.h
@@ -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