aboutsummaryrefslogtreecommitdiffstats
path: root/addressbook
diff options
context:
space:
mode:
authorEttore Perazzoli <ettore@src.gnome.org>2000-08-09 13:56:30 +0800
committerEttore Perazzoli <ettore@src.gnome.org>2000-08-09 13:56:30 +0800
commitcae0d7fb4539887d009aa0803b5fdcb5537ee1d5 (patch)
treead3d66ff825da0428df8da10a0989296dd468075 /addressbook
parent21b756aa3c3541834383013d8bd1e972f758ad1c (diff)
downloadgsoc2013-evolution-cae0d7fb4539887d009aa0803b5fdcb5537ee1d5.tar.gz
gsoc2013-evolution-cae0d7fb4539887d009aa0803b5fdcb5537ee1d5.tar.zst
gsoc2013-evolution-cae0d7fb4539887d009aa0803b5fdcb5537ee1d5.zip
Remove conflict marks.
svn path=/trunk/; revision=4640
Diffstat (limited to 'addressbook')
0 files changed, 0 insertions, 0 deletions