[Bug fortran/79843] diagnostics: missing word in fortran/symbol.c, conflict_std

[dominiq at gcc dot gnu.org]

https://gcc.gnu.org/bugzilla/show_bug.cgi?id=79843

--- Comment #2 from dominiq at gcc dot gnu.org ---
Author: dominiq
Date: Mon Jul  3 17:56:08 2017
New Revision: 249933

URL: https://gcc.gnu.org/viewcvs?rev=249933&root=gcc&view=rev
Log:
2017-07-03  Dominique d'Humieres  <dominiq@lps.ens.fr>

        PR fortran/79843
        * symbol.c (check_conflict): Add missing "conflicts".

        PR testsuite/79843
        * gfortran.dg/namelist_3.f90: Adjust the dg-error string.
        * gfortran.dg/pointer_intent_2.f90: Likewise.


Modified:
    trunk/gcc/fortran/ChangeLog
    trunk/gcc/fortran/symbol.c
    trunk/gcc/testsuite/ChangeLog
    trunk/gcc/testsuite/gfortran.dg/namelist_3.f90
    trunk/gcc/testsuite/gfortran.dg/pointer_intent_2.f90