diff options
| author | Jeffrey Stedfast <fejj@src.gnome.org> | 2001-09-06 07:04:56 +0800 |
|---|---|---|
| committer | Jeffrey Stedfast <fejj@src.gnome.org> | 2001-09-06 07:04:56 +0800 |
| commit | 56e5135e5ad332d906642c5bd923bf2fbd6d5296 (patch) | |
| tree | deeb33725c597a93ead0453ba69c03f0030c12b5 | |
| parent | de4c391ec2eba36667a8ed7622f57f1877dda934 (diff) | |
| download | gsoc2013-evolution-56e5135e5ad332d906642c5bd923bf2fbd6d5296.tar.gz gsoc2013-evolution-56e5135e5ad332d906642c5bd923bf2fbd6d5296.tar.zst gsoc2013-evolution-56e5135e5ad332d906642c5bd923bf2fbd6d5296.zip | |
removed conflict stuff
svn path=/trunk/; revision=12641
| -rw-r--r-- | mail/ChangeLog | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/mail/ChangeLog b/mail/ChangeLog index 568b6dcc74..bbddcbce1c 100644 --- a/mail/ChangeLog +++ b/mail/ChangeLog @@ -67,7 +67,6 @@ 2001-09-05 Ettore Perazzoli <ettore@ximian.com> ->>>>>>> 1.1649 * message-browser.c (message_browser_new): s/Evolution/Ximian Evolution/. |