From 7049788b998721f6afb64c2849df915cf0afe688 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Josep=20Puigdemont=20i=20Casamaj=C3=B3?=
 <joseppc@src.gnome.org>
Date: Sat, 4 Feb 2006 13:36:36 +0000
Subject: Resolve conflicts.

svn path=/trunk/; revision=31404
---
 po/ChangeLog | 2 --
 1 file changed, 2 deletions(-)

(limited to 'po/ChangeLog')

diff --git a/po/ChangeLog b/po/ChangeLog
index 7150d87fa4..eae0d5037c 100644
--- a/po/ChangeLog
+++ b/po/ChangeLog
@@ -35,7 +35,6 @@
 
 	* en_CA.po: Updated Canadian English translation.
 
->>>>>>> 1.2452
 2006-01-31  Ilkka Tuohela  <hile@iki.fi>
 
 	* fi.po: Updated Finnish translation.
@@ -1699,7 +1698,6 @@
 	* POTFILES.in : Added missing exchange files.
 
 2005-07-15  Shreyas Srinivasan  <sshreyas@novell.com>
->>>>>>> 1.2099
 
 	*plugins/mail-account-disable/org-gnome-mail-account-disable.eplug.xml
 	: Add file for translation.
-- 
cgit v1.2.3