diff options
| author | Michael Meissner <meissner@gcc.gnu.org> | 2009-08-25 20:42:47 +0000 |
|---|---|---|
| committer | Michael Meissner <meissner@gcc.gnu.org> | 2009-08-25 20:42:47 +0000 |
| commit | 79232baaf890c7223876b5ffb93ed05e7948d7a3 (patch) | |
| tree | 5259eaeaf4c24b59699d7441e1631b931073f7bc | |
| parent | e7f8fba9c3e747956a8a9ff356d68f58474c45c6 (diff) | |
| download | gcc-79232baaf890c7223876b5ffb93ed05e7948d7a3.zip gcc-79232baaf890c7223876b5ffb93ed05e7948d7a3.tar.gz gcc-79232baaf890c7223876b5ffb93ed05e7948d7a3.tar.bz2 | |
Remove svn merge marker
From-SVN: r151095
| -rw-r--r-- | gcc/fortran/ChangeLog | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/gcc/fortran/ChangeLog b/gcc/fortran/ChangeLog index d94f459..e2691a9 100644 --- a/gcc/fortran/ChangeLog +++ b/gcc/fortran/ChangeLog @@ -80,7 +80,6 @@ in both modes to handle consecutive single quotes. Test for extra characters in fmt, issue warning. ->>>>>>> .r151068 2009-08-21 Janus Weil <janus@gcc.gnu.org> PR fortran/41106 |