From: Adam Leibson <adaml@fsf.org>
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.git

commit
---

diff --git a/en/index.html b/en/index.html
index b2e9b94d..b7543c3d 100644
--- a/en/index.html
+++ b/en/index.html
@@ -159,14 +159,10 @@
 							<dl>
 
 								<dt>I can't find the menu.</dt>
-<<<<<<< HEAD
 									<dd>In many new email programs, the main menu is represented by an image of three stacked horizontal bars.</dd>
 								<dt>My email looks weird</dt>
 									<dd>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.</dd>
-=======
 									<dd>In many new email programs, the main menu is represented by an image of three stacked horizontal bars.</dd>		
-	
->>>>>>> 9a00aa77a11cf9a9e6bb7cc459a30aa7c075885d
 
 								<dt class="feedback">Don't see a solution to your problem?</dt>
 									<dd class="feedback">Please let us know on the <a href="https://libreplanet.org/wiki/GPG_guide/Public_Review">feedback page</a>.</dd>
@@ -546,8 +542,8 @@ default). Once encryption is off, hit Send.</p>
 					</div><!-- End .main -->
 				</div><!-- End #step-lost_key .step-->
 
-<<<<<<< HEAD
-=======
+
+
                                 <!-- ~~~~~~~~~ a div for each step  ~~~~~~~~~ -->
                                 <!---<div id="transfer-key" class="step">
                                         <div class="main">
@@ -557,7 +553,7 @@ default). Once encryption is off, hit Send.</p>
                                 </div><!-- End #step-lost_key .step-->-->
 
 
->>>>>>> 9a00aa77a11cf9a9e6bb7cc459a30aa7c075885d
+
 
                                 <!-- ~~~~~~~~~ a div for each step  ~~~~~~~~~ -->
                                 <div id="webmail-and-GnuPG" class="step">