From 136c6dd92dc81678d0f18429a35409125454f749 Mon Sep 17 00:00:00 2001
From: Ludovic Marcotte <lmarcotte@inverse.ca>
Date: Fri, 20 Jul 2012 18:24:52 +0000
Subject: [PATCH] Fixed merge

Monotone-Parent: bfc3cb63453015f444ec1a1fd20faeece6be2042
Monotone-Revision: bdb3c86bf127fecd411885ad5bcf84eb8af9f672

Monotone-Author: ludovic@Sophos.ca
Monotone-Date: 2012-07-20T18:24:52
Monotone-Branch: ca.inverse.sogo
---
 ChangeLog | 2 --
 1 file changed, 2 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 2f98d22ad..03159f886 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,11 +1,9 @@
-<<<<<<< variant A
 2012-07-20  Ludovic Marcotte  <lmarcotte@inverse.ca>
 
 	* UI/MailPartViewers/UIxMailRenderingContext.m
 	(_shouldDisplayAsAttachment:): refactored to consider
 	the "bodyId" parameter only for non text/* parts.
 
->>>>>>> variant B
 2012-07-20  Francis Lachapelle  <flachapelle@inverse.ca>
 
 	* UI/WebServerResources/MailerUI.js (onEmailTo): append the email