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

gcc/fortran/ChangeLog

+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

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