From: Adam Leibson Date: Mon, 24 Aug 2015 20:30:00 +0000 (-0400) Subject: commit X-Git-Url: https://vcs.fsf.org/?a=commitdiff_plain;h=23422a8e28779f0570dfcf5ef0d9b322efc372fc;p=enc-live.git commit --- diff --git a/en/index.html b/en/index.html index b2e9b94..b7543c3 100644 --- a/en/index.html +++ b/en/index.html @@ -159,14 +159,10 @@
I can't find the menu.
-<<<<<<< HEAD
In many new email programs, the main menu is represented by an image of three stacked horizontal bars.
My email looks weird
Enigmail doesn't tend to play nice with HTML, which is used to format emails. To send an HTML-formatted email without encryption and or a signature, hold down the Shift key when you select compose. You can then write an email as if Enigmail wasn't there.
-=======
In many new email programs, the main menu is represented by an image of three stacked horizontal bars.
- ->>>>>>> 9a00aa77a11cf9a9e6bb7cc459a30aa7c075885d @@ -546,8 +542,8 @@ default). Once encryption is off, hit Send.

-<<<<<<< HEAD -======= + + --> ->>>>>>> 9a00aa77a11cf9a9e6bb7cc459a30aa7c075885d +