1 files changed, 23 insertions, 0 deletions
diff --git a/distro/common/html/chef-shell.1.html b/distro/common/html/chef-shell.1.html
index 195870cc53..9c435c6f3d 100644
--- a/distro/common/html/chef-shell.1.html
+++ b/distro/common/html/chef-shell.1.html
@@ -256,6 +256,7 @@ libraries.</p>
 <h2 id="SEE-ALSO">SEE ALSO</h2>
 
 <p>  <span class="man-ref">chef-client<span class="s">(8)</span></span> <span class="man-ref">knife<span class="s">(1)</span></span>
+<<<<<<< HEAD:distro/common/html/chef-shell.1.html
   <a href="http://wiki.opscode.com/display/chef/Chef+Shell" data-bare-link="true">http://wiki.opscode.com/display/chef/Chef+Shell</a></p>
 
 <h2 id="AUTHOR">AUTHOR</h2>
@@ -267,11 +268,24 @@ libraries.</p>
 <h2 id="DOCUMENTATION">DOCUMENTATION</h2>
 
 <p>   This manual page was written by Daniel DeLeo <a href="&#x6d;&#97;&#105;&#x6c;&#116;&#111;&#x3a;&#x64;&#x61;&#x6e;&#x40;&#111;&#x70;&#x73;&#99;&#111;&#x64;&#101;&#x2e;&#99;&#111;&#x6d;" data-bare-link="true">&#100;&#x61;&#110;&#64;&#x6f;&#x70;&#115;&#99;&#x6f;&#x64;&#101;&#x2e;&#x63;&#111;&#x6d;</a>.
+=======
+  <a href="http://wiki.opscode.com/display/chef/Shef" data-bare-link="true">http://wiki.opscode.com/display/chef/Shef</a></p>
+
+<h2 id="AUTHOR">AUTHOR</h2>
+
+<p>   Chef was written by Adam Jacob <a href="&#x6d;&#x61;&#105;&#108;&#116;&#x6f;&#x3a;&#97;&#x64;&#x61;&#109;&#64;&#111;&#x70;&#115;&#99;&#x6f;&#100;&#101;&#46;&#x63;&#111;&#109;" data-bare-link="true">&#97;&#x64;&#x61;&#109;&#64;&#111;&#x70;&#x73;&#x63;&#111;&#x64;&#x65;&#x2e;&#99;&#111;&#x6d;</a> with many
+   contributions from the community. Shef was written by Daniel DeLeo.</p>
+
+<h2 id="DOCUMENTATION">DOCUMENTATION</h2>
+
+<p>   This manual page was written by Daniel DeLeo <a href="&#109;&#x61;&#x69;&#108;&#116;&#x6f;&#58;&#100;&#97;&#110;&#64;&#111;&#x70;&#x73;&#99;&#111;&#100;&#x65;&#46;&#99;&#x6f;&#x6d;" data-bare-link="true">&#x64;&#97;&#x6e;&#64;&#x6f;&#112;&#115;&#x63;&#111;&#100;&#x65;&#x2e;&#99;&#x6f;&#109;</a>.
+>>>>>>> 10-stable:chef/distro/common/html/shef.1.html
    Permission is granted to copy, distribute and / or modify this
    document under the terms of the Apache 2.0 License.</p>
 
 <h2 id="CHEF">CHEF</h2>
 
+<<<<<<< HEAD:distro/common/html/chef-shell.1.html
 <p>   chef-shell is distributed with Chef. <a href="http://wiki.opscode.com/display/chef/Home" data-bare-link="true">http://wiki.opscode.com/display/chef/Home</a></p>
 
 
@@ -279,6 +293,15 @@ libraries.</p>
     <li class='tl'>Chef 11.0.0.alpha</li>
     <li class='tc'>September 2012</li>
     <li class='tr'>chef-shell(1)</li>
+=======
+<p>   Shef is distributed with Chef. <a href="http://wiki.opscode.com/display/chef/Home" data-bare-link="true">http://wiki.opscode.com/display/chef/Home</a></p>
+
+
+  <ol class='man-decor man-foot man foot'>
+    <li class='tl'>Chef 10.18.1</li>
+    <li class='tc'>January 2013</li>
+    <li class='tr'>shef(1)</li>
+>>>>>>> 10-stable:chef/distro/common/html/shef.1.html
   </ol>
 
   </div>