diff options
| author | Michael Meeks <mmeeks@src.gnome.org> | 2000-10-03 07:31:29 +0800 |
|---|---|---|
| committer | Michael Meeks <mmeeks@src.gnome.org> | 2000-10-03 07:31:29 +0800 |
| commit | f5394d001ea69f0d6a5660c6744580275ebbf9c3 (patch) | |
| tree | 3cd49dc40bb129f08f52191d687f399fec97dee2 | |
| parent | afc127193137188d4efc11194698a2b22f138f75 (diff) | |
| download | gsoc2013-evolution-f5394d001ea69f0d6a5660c6744580275ebbf9c3.tar gsoc2013-evolution-f5394d001ea69f0d6a5660c6744580275ebbf9c3.tar.gz gsoc2013-evolution-f5394d001ea69f0d6a5660c6744580275ebbf9c3.tar.bz2 gsoc2013-evolution-f5394d001ea69f0d6a5660c6744580275ebbf9c3.tar.lz gsoc2013-evolution-f5394d001ea69f0d6a5660c6744580275ebbf9c3.tar.xz gsoc2013-evolution-f5394d001ea69f0d6a5660c6744580275ebbf9c3.tar.zst gsoc2013-evolution-f5394d001ea69f0d6a5660c6744580275ebbf9c3.zip | |
remove spurious conflict indicator.
svn path=/trunk/; revision=5679
| -rw-r--r-- | mail/ChangeLog | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/mail/ChangeLog b/mail/ChangeLog index 78537eaa31..26a2ab8a42 100644 --- a/mail/ChangeLog +++ b/mail/ChangeLog @@ -445,7 +445,6 @@ (thread_messages_free): Remove the return, run as is. (prune_empty): Plugged another small leak. ->>>>>>> 1.552 2000-09-11 Jeffrey Stedfast <fejj@helixcode.com> * mail-callbacks.c (run_filter_ondemand): Updated to use the new |