diff options
Diffstat (limited to 'distro/common/html/knife.1.html')
-rw-r--r-- | distro/common/html/knife.1.html | 13 |
1 files changed, 13 insertions, 0 deletions
diff --git a/distro/common/html/knife.1.html b/distro/common/html/knife.1.html index bebaf89a87..50dd8aba94 100644 --- a/distro/common/html/knife.1.html +++ b/distro/common/html/knife.1.html @@ -291,12 +291,20 @@ data editing entirely.</dd> <h2 id="AUTHOR">AUTHOR</h2> +<<<<<<< HEAD:distro/common/html/knife.1.html <p> Chef was written by Adam Jacob <a href="mailto:adam@opscode.com" data-bare-link="true">adam@opscode.com</a> of Opscode +======= +<p> Chef was written by Adam Jacob <a href="mailto:adam@opscode.com" data-bare-link="true">adam@opscode.com</a> of Opscode +>>>>>>> 10-stable:chef/distro/common/html/knife.1.html (<a href="http://www.opscode.com" data-bare-link="true">http://www.opscode.com</a>), with contributions from the community.</p> <h2 id="DOCUMENTATION">DOCUMENTATION</h2> +<<<<<<< HEAD:distro/common/html/knife.1.html <p> This manual page was written by Joshua Timberman <a href="mailto:joshua@opscode.com" data-bare-link="true">joshua@opscode.com</a>.</p> +======= +<p> This manual page was written by Joshua Timberman <a href="mailto:joshua@opscode.com" data-bare-link="true">joshua@opscode.com</a>.</p> +>>>>>>> 10-stable:chef/distro/common/html/knife.1.html <h2 id="LICENSE">LICENSE</h2> @@ -310,8 +318,13 @@ data editing entirely.</dd> <ol class='man-decor man-foot man foot'> +<<<<<<< HEAD:distro/common/html/knife.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.1.html <li class='tr'>knife(1)</li> </ol> |