I don't remember what I'm committing.

diff --cc index.html
index 3ca9686fb403dc77375cd8e24daf63297f7fa64a,b9923704fe1eede4d3061d10e438c53f5b9490a9..b0e128df944776e04c06d786c546954527980f9e
--- 1/index.html
--- 2/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">

diff --cc mac.html
Simple merge