diff options
author | Jon Trowbridge <trow@src.gnome.org> | 2001-06-07 06:35:55 +0800 |
---|---|---|
committer | Jon Trowbridge <trow@src.gnome.org> | 2001-06-07 06:35:55 +0800 |
commit | 632f8e0634d47070f146203d7cd765232ffa78a5 (patch) | |
tree | 7b3d67139406396064b7f13b33605ed3222a3168 /doc | |
parent | 53fe0954cb52ebad13c96967077501fe28b868d3 (diff) | |
download | gsoc2013-evolution-632f8e0634d47070f146203d7cd765232ffa78a5.tar.gz gsoc2013-evolution-632f8e0634d47070f146203d7cd765232ffa78a5.tar.zst gsoc2013-evolution-632f8e0634d47070f146203d7cd765232ffa78a5.zip |
Removed some left-over conflict indicators.
svn path=/trunk/; revision=10140
Diffstat (limited to 'doc')
0 files changed, 0 insertions, 0 deletions