diff options
| author | Jon Trowbridge <trow@src.gnome.org> | 2001-10-30 11:50:18 +0800 |
|---|---|---|
| committer | Jon Trowbridge <trow@src.gnome.org> | 2001-10-30 11:50:18 +0800 |
| commit | 42617c07f70eb52d795cf1784d1d7b343cf7c6a5 (patch) | |
| tree | aeaba762bafa232f494ee6e99ac0358cc7834dac | |
| parent | 1fc908bfb1f00c66e636b91e5e5b4ec30bc013eb (diff) | |
| download | gsoc2013-evolution-42617c07f70eb52d795cf1784d1d7b343cf7c6a5.tar gsoc2013-evolution-42617c07f70eb52d795cf1784d1d7b343cf7c6a5.tar.gz gsoc2013-evolution-42617c07f70eb52d795cf1784d1d7b343cf7c6a5.tar.bz2 gsoc2013-evolution-42617c07f70eb52d795cf1784d1d7b343cf7c6a5.tar.lz gsoc2013-evolution-42617c07f70eb52d795cf1784d1d7b343cf7c6a5.tar.xz gsoc2013-evolution-42617c07f70eb52d795cf1784d1d7b343cf7c6a5.tar.zst gsoc2013-evolution-42617c07f70eb52d795cf1784d1d7b343cf7c6a5.zip | |
Removed conflict spew.
svn path=/trunk/; revision=14416
| -rw-r--r-- | addressbook/ChangeLog | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/addressbook/ChangeLog b/addressbook/ChangeLog index e6a35a9c74..b4946614a6 100644 --- a/addressbook/ChangeLog +++ b/addressbook/ChangeLog @@ -164,7 +164,6 @@ * conduit/address-conduit.c (add_record): unref ecard when done ->>>>>>> 1.898 2001-10-28 Jon Trowbridge <trow@ximian.com> * backend/ebook/e-card.c (e_card_date_from_string): Expose this |