diff options
author | Josep Puigdemont i Casamajó <joseppc@src.gnome.org> | 2006-09-04 01:22:23 +0800 |
---|---|---|
committer | Josep Puigdemont i Casamajó <joseppc@src.gnome.org> | 2006-09-04 01:22:23 +0800 |
commit | 8ddfa79e4fd906f4b1cfe760d98eb09fc0d17e8b (patch) | |
tree | 9448ed2632349b616f427983ec1363817fb08bc5 /.cvsignore | |
parent | 3613e6b205bee6006d1eaa9bb159928d1cc01e29 (diff) | |
download | gsoc2013-evolution-8ddfa79e4fd906f4b1cfe760d98eb09fc0d17e8b.tar gsoc2013-evolution-8ddfa79e4fd906f4b1cfe760d98eb09fc0d17e8b.tar.gz gsoc2013-evolution-8ddfa79e4fd906f4b1cfe760d98eb09fc0d17e8b.tar.bz2 gsoc2013-evolution-8ddfa79e4fd906f4b1cfe760d98eb09fc0d17e8b.tar.lz gsoc2013-evolution-8ddfa79e4fd906f4b1cfe760d98eb09fc0d17e8b.tar.xz gsoc2013-evolution-8ddfa79e4fd906f4b1cfe760d98eb09fc0d17e8b.tar.zst gsoc2013-evolution-8ddfa79e4fd906f4b1cfe760d98eb09fc0d17e8b.zip |
Removed conflict indicators.
svn path=/trunk/; revision=32727
Diffstat (limited to '.cvsignore')
0 files changed, 0 insertions, 0 deletions