symbol.c (check_conflict): Fix error message.

2007-01-05  Tobias Burnus  <burnus@net-b.de>

       * symbol.c (check_conflict): Fix error message.

From-SVN: r120496

diff --git a/gcc/fortran/ChangeLog b/gcc/fortran/ChangeLog
index 0d9ade0da9d8fad37107b5684c9763399c32f762..c574dc42f23d0ea021ea4ed4747f18a3b614329e 100644 (file)
--- 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 a1aaae8fddff02e17d816da548e675bbbedfe49d..85aff8674a4ba37b9f3eed7d43640c9d771b19c4 100644 (file)
--- 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