From: Zak Rogoff <atticus@Amdijefri.office.fsf.org>
Date: Wed, 4 Jun 2014 00:40:44 +0000 (-0400)
Subject: I don't remember what I'm committing.
X-Git-Url: https://vcs.fsf.org/?a=commitdiff_plain;h=226ff59cd85a70ab328b4c197e7c12988d76a4d0;p=enc.git

I don't remember what I'm committing.
---

226ff59cd85a70ab328b4c197e7c12988d76a4d0
diff --cc index.html
index 3ca9686f,b9923704..b0e128df
--- a/index.html
+++ b/index.html
@@@ -293,10 -293,22 +293,29 @@@
  		<section class="row" id="section6">
  			<div>
  				<!-- ~~~~~~~~~ section title + graphics  ~~~~~~~~~ -->
++<<<<<<< HEAD
 +				<div class="sidebar">
 +					<h2><em>#6</em> Next steps</h2>
 +					<p><img src="static/img/placeholders/placeholder.png" alt="Placeholder" /></p>
 +				</div><!-- /.sidebar -->
++=======
+ 				<div class="section-intro">
+ 					<div class="sidebar">
+ 						<h2><em>#6</em> Next steps</h2>
+ 					</div><!-- /.sidebar -->
+ 				</div><!-- End .section-intro -->
+ 
+ 				<!-- ~~~~~~~~~ a div for each step  ~~~~~~~~~ -->
+ 				<div id="step-gnulinux" class="step">
+ 					<div class="sidebar">
+ 						<p><img src="http://static.fsf.org/nosvn/enc-dev0/img/placeholders/placeholder.png" alt="Placeholder" /></p>
+ 					</div><!-- /.sidebar -->
+ 					<div class="main">
+ 						<h3>Switch to GNU/Linux</h3>
+ 						<p>Coming soon</p>
+ 					</div><!-- End .main -->
+ 				</div><!-- End #step-gnulinux .step -->
++>>>>>>> 875881099978b561ba38318558bf0cf86f0bfa9a
  				<!-- ~~~~~~~~~ a div for each step  ~~~~~~~~~ -->
  				<div id="step-keysigning_party" class="step">
  					<div class="main">