From: Jean-Paul Pelteret Date: Fri, 13 Nov 2015 14:03:00 +0000 (+0100) Subject: Remove errant line left over from a merge conflict. X-Git-Tag: v8.4.0-rc2~229^2 X-Git-Url: https://gitweb.dealii.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c663223558ef1de22123434c3ae8c46ad31990c4;p=dealii.git 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 aa1f548aaa..164018c81d 100644 --- a/include/deal.II/lac/precondition_selector.h +++ b/include/deal.II/lac/precondition_selector.h @@ -205,7 +205,6 @@ void PreconditionSelector::use_matrix(const MatrixType &M A=&M; } -<<<<<<< fc87b7c22812a5fc7751b36c66b20e6fa54df72c template inline typename PreconditionSelector::size_type