diff options
author | Tor Lillqvist <tml@src.gnome.org> | 2006-01-04 10:06:40 +0800 |
---|---|---|
committer | Tor Lillqvist <tml@src.gnome.org> | 2006-01-04 10:06:40 +0800 |
commit | 9842fcaea981db6a6f4692101079557953bc5914 (patch) | |
tree | 5c4bebecc87a8123bc3db27a2baff7bc4b2c2901 /NEWS | |
parent | 3ee258c7561792a7a9b999751ec99288ace2a3b4 (diff) | |
download | gsoc2013-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 'NEWS')
0 files changed, 0 insertions, 0 deletions