diff options
| author | Veerapuram Varadhan <vvaradan@src.gnome.org> | 2005-12-20 18:06:39 +0800 |
|---|---|---|
| committer | Veerapuram Varadhan <vvaradan@src.gnome.org> | 2005-12-20 18:06:39 +0800 |
| commit | 92ca90685521bed0ecbb49d5c18273b6028783ad (patch) | |
| tree | 5744b77e59f194d8657dc1788648bae2a679b014 /mail | |
| parent | 8981b062d6a0d0cdc65258d173ef03909fe59986 (diff) | |
| download | gsoc2013-evolution-92ca90685521bed0ecbb49d5c18273b6028783ad.tar gsoc2013-evolution-92ca90685521bed0ecbb49d5c18273b6028783ad.tar.gz gsoc2013-evolution-92ca90685521bed0ecbb49d5c18273b6028783ad.tar.bz2 gsoc2013-evolution-92ca90685521bed0ecbb49d5c18273b6028783ad.tar.lz gsoc2013-evolution-92ca90685521bed0ecbb49d5c18273b6028783ad.tar.xz gsoc2013-evolution-92ca90685521bed0ecbb49d5c18273b6028783ad.tar.zst gsoc2013-evolution-92ca90685521bed0ecbb49d5c18273b6028783ad.zip | |
removed conflict indicators.
svn path=/trunk/; revision=30900
Diffstat (limited to 'mail')
| -rw-r--r-- | mail/ChangeLog | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/mail/ChangeLog b/mail/ChangeLog index 4865064e49..1199243afd 100644 --- a/mail/ChangeLog +++ b/mail/ChangeLog @@ -110,7 +110,6 @@ * em-folder-view.c: (emfv_setting_notify): Respond to the change of /apps/evolution/mail/display/show_deleted and thread_list in gconf. ->>>>>>> 1.3748 2005-12-12 Karsten Bräckelmann <guenther@rudersport.de> * em-folder-view.c: Mail Context Menu re-ordered correctly, |