diff options
Diffstat (limited to 'distro/common/html/knife-cookbook.1.html')
-rw-r--r-- | distro/common/html/knife-cookbook.1.html | 13 |
1 files changed, 13 insertions, 0 deletions
diff --git a/distro/common/html/knife-cookbook.1.html b/distro/common/html/knife-cookbook.1.html index b98d9a9382..fe600bad32 100644 --- a/distro/common/html/knife-cookbook.1.html +++ b/distro/common/html/knife-cookbook.1.html @@ -361,11 +361,19 @@ cookbook.</p> <h2 id="AUTHOR">AUTHOR</h2> +<<<<<<< HEAD:distro/common/html/knife-cookbook.1.html <p> Chef was written by Adam Jacob <a href="mailto:adam@opscode.com" data-bare-link="true">adam@opscode.com</a> with many contributions from the community.</p> <h2 id="DOCUMENTATION">DOCUMENTATION</h2> <p> This manual page was written by Joshua Timberman <a href="mailto:joshua@opscode.com" data-bare-link="true">joshua@opscode.com</a>. +======= +<p> Chef was written by Adam Jacob <a href="mailto:adam@opscode.com" data-bare-link="true">adam@opscode.com</a> with many contributions from the community.</p> + +<h2 id="DOCUMENTATION">DOCUMENTATION</h2> + +<p> This manual page was written by Joshua Timberman <a href="mailto:joshua@opscode.com" data-bare-link="true">joshua@opscode.com</a>. +>>>>>>> 10-stable:chef/distro/common/html/knife-cookbook.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> @@ -374,8 +382,13 @@ cookbook.</p> <ol class='man-decor man-foot man foot'> +<<<<<<< HEAD:distro/common/html/knife-cookbook.1.html <li class='tl'>Chef 11.0.0.alpha</li> <li class='tc'>September 2012</li> +======= + <li class='tl'>Chef 10.18.1</li> + <li class='tc'>January 2013</li> +>>>>>>> 10-stable:chef/distro/common/html/knife-cookbook.1.html <li class='tr'>knife-cookbook(1)</li> </ol> |