aboutsummaryrefslogtreecommitdiffstats
path: root/plugins/calendar-file
diff options
context:
space:
mode:
authorTor Lillqvist <tml@src.gnome.org>2006-01-04 10:06:40 +0800
committerTor Lillqvist <tml@src.gnome.org>2006-01-04 10:06:40 +0800
commit9842fcaea981db6a6f4692101079557953bc5914 (patch)
tree5c4bebecc87a8123bc3db27a2baff7bc4b2c2901 /plugins/calendar-file
parent3ee258c7561792a7a9b999751ec99288ace2a3b4 (diff)
downloadgsoc2013-evolution-9842fcaea981db6a6f4692101079557953bc5914.tar
gsoc2013-evolution-9842fcaea981db6a6f4692101079557953bc5914.tar.gz
gsoc2013-evolution-9842fcaea981db6a6f4692101079557953bc5914.tar.bz2
gsoc2013-evolution-9842fcaea981db6a6f4692101079557953bc5914.tar.lz
gsoc2013-evolution-9842fcaea981db6a6f4692101079557953bc5914.tar.xz
gsoc2013-evolution-9842fcaea981db6a6f4692101079557953bc5914.tar.zst
gsoc2013-evolution-9842fcaea981db6a6f4692101079557953bc5914.zip
Remove stray cvs conflict indicator.
svn path=/trunk/; revision=31043
Diffstat (limited to 'plugins/calendar-file')
0 files changed, 0 insertions, 0 deletions