aboutsummaryrefslogtreecommitdiffstats
path: root/NEWS
diff options
context:
space:
mode:
authorMike Kestner <mkestner@src.gnome.org>2002-10-08 03:46:50 +0800
committerMike Kestner <mkestner@src.gnome.org>2002-10-08 03:46:50 +0800
commit1bc177411afa2f54e0904eff075f25632bfaded6 (patch)
treeaf4222c9166b615425ef7e64f8484a1b9e14702f /NEWS
parentcf45adcda51370eb241c0533d04c965456b0b6da (diff)
downloadgsoc2013-evolution-1bc177411afa2f54e0904eff075f25632bfaded6.tar
gsoc2013-evolution-1bc177411afa2f54e0904eff075f25632bfaded6.tar.gz
gsoc2013-evolution-1bc177411afa2f54e0904eff075f25632bfaded6.tar.bz2
gsoc2013-evolution-1bc177411afa2f54e0904eff075f25632bfaded6.tar.lz
gsoc2013-evolution-1bc177411afa2f54e0904eff075f25632bfaded6.tar.xz
gsoc2013-evolution-1bc177411afa2f54e0904eff075f25632bfaded6.tar.zst
gsoc2013-evolution-1bc177411afa2f54e0904eff075f25632bfaded6.zip
Remove a conflict tag.
Remove a conflict tag. svn path=/trunk/; revision=18342
Diffstat (limited to 'NEWS')
-rw-r--r--NEWS1
1 files changed, 0 insertions, 1 deletions
diff --git a/NEWS b/NEWS
index 16634fcd73..bff8c5fe67 100644
--- a/NEWS
+++ b/NEWS
@@ -181,7 +181,6 @@ Updated translations:
Evolution 1.1.1, 2002-09-09
---------------------------
->>>>>>> 1.134
New features: