diff options
author | Ettore Perazzoli <ettore@src.gnome.org> | 2000-08-09 13:56:30 +0800 |
---|---|---|
committer | Ettore Perazzoli <ettore@src.gnome.org> | 2000-08-09 13:56:30 +0800 |
commit | cae0d7fb4539887d009aa0803b5fdcb5537ee1d5 (patch) | |
tree | ad3d66ff825da0428df8da10a0989296dd468075 /addressbook/ChangeLog | |
parent | 21b756aa3c3541834383013d8bd1e972f758ad1c (diff) | |
download | gsoc2013-evolution-cae0d7fb4539887d009aa0803b5fdcb5537ee1d5.tar gsoc2013-evolution-cae0d7fb4539887d009aa0803b5fdcb5537ee1d5.tar.gz gsoc2013-evolution-cae0d7fb4539887d009aa0803b5fdcb5537ee1d5.tar.bz2 gsoc2013-evolution-cae0d7fb4539887d009aa0803b5fdcb5537ee1d5.tar.lz gsoc2013-evolution-cae0d7fb4539887d009aa0803b5fdcb5537ee1d5.tar.xz gsoc2013-evolution-cae0d7fb4539887d009aa0803b5fdcb5537ee1d5.tar.zst gsoc2013-evolution-cae0d7fb4539887d009aa0803b5fdcb5537ee1d5.zip |
Remove conflict marks.
svn path=/trunk/; revision=4640
Diffstat (limited to 'addressbook/ChangeLog')
0 files changed, 0 insertions, 0 deletions