aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--gcc/fortran/ChangeLog4
-rw-r--r--gcc/fortran/symbol.c2
2 files changed, 5 insertions, 1 deletions
diff --git a/gcc/fortran/ChangeLog b/gcc/fortran/ChangeLog
index 0d9ade0..c574dc4 100644
--- a/gcc/fortran/ChangeLog
+++ b/gcc/fortran/ChangeLog
@@ -1,3 +1,7 @@
+2007-01-05 Tobias Burnus <burnus@net-b.de>
+
+ * symbol.c (check_conflict): Fix error message.
+
2007-01-05 Paul Thomas <pault@gcc.gnu.org>
PR fortran/23232
diff --git a/gcc/fortran/symbol.c b/gcc/fortran/symbol.c
index a1aaae8..85aff86 100644
--- a/gcc/fortran/symbol.c
+++ b/gcc/fortran/symbol.c
@@ -573,7 +573,7 @@ conflict_std:
if (name == NULL)
{
return gfc_notify_std (standard, "Fortran 2003: %s attribute "
- "conflicts with %s attribute at %L", a1, a2,
+ "with %s attribute at %L", a1, a2,
where);
}
else