diff options
author | Mike Kestner <mkestner@src.gnome.org> | 2002-10-08 03:46:50 +0800 |
---|---|---|
committer | Mike Kestner <mkestner@src.gnome.org> | 2002-10-08 03:46:50 +0800 |
commit | 1bc177411afa2f54e0904eff075f25632bfaded6 (patch) | |
tree | af4222c9166b615425ef7e64f8484a1b9e14702f | |
parent | cf45adcda51370eb241c0533d04c965456b0b6da (diff) | |
download | gsoc2013-evolution-1bc177411afa2f54e0904eff075f25632bfaded6.tar.gz gsoc2013-evolution-1bc177411afa2f54e0904eff075f25632bfaded6.tar.zst gsoc2013-evolution-1bc177411afa2f54e0904eff075f25632bfaded6.zip |
Remove a conflict tag.
Remove a conflict tag.
svn path=/trunk/; revision=18342
-rw-r--r-- | NEWS | 1 |
1 files changed, 0 insertions, 1 deletions
@@ -181,7 +181,6 @@ Updated translations: Evolution 1.1.1, 2002-09-09 --------------------------- ->>>>>>> 1.134 New features: |