aboutsummaryrefslogtreecommitdiffstats
path: root/ui/evolution-comp-editor.xml
diff options
context:
space:
mode:
authorJon Trowbridge <trow@src.gnome.org>2001-07-07 13:41:00 +0800
committerJon Trowbridge <trow@src.gnome.org>2001-07-07 13:41:00 +0800
commitb950c435e47637e109a1b5c4916024b5c7e322eb (patch)
treee0b9b3d92c2596993c316fe80efd397a1ee627e8 /ui/evolution-comp-editor.xml
parent200f21429939f2b27591bb0c5264c9d6e9ca8e0a (diff)
downloadgsoc2013-evolution-b950c435e47637e109a1b5c4916024b5c7e322eb.tar
gsoc2013-evolution-b950c435e47637e109a1b5c4916024b5c7e322eb.tar.gz
gsoc2013-evolution-b950c435e47637e109a1b5c4916024b5c7e322eb.tar.bz2
gsoc2013-evolution-b950c435e47637e109a1b5c4916024b5c7e322eb.tar.lz
gsoc2013-evolution-b950c435e47637e109a1b5c4916024b5c7e322eb.tar.xz
gsoc2013-evolution-b950c435e47637e109a1b5c4916024b5c7e322eb.tar.zst
gsoc2013-evolution-b950c435e47637e109a1b5c4916024b5c7e322eb.zip
Removed old CVS conflict marker.
svn path=/trunk/; revision=10879
Diffstat (limited to 'ui/evolution-comp-editor.xml')
0 files changed, 0 insertions, 0 deletions