diff options
Diffstat (limited to 'distro/common/html/chef-solr.8.html')
-rw-r--r-- | distro/common/html/chef-solr.8.html | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/distro/common/html/chef-solr.8.html b/distro/common/html/chef-solr.8.html index 0e13c25d90..ef9070eab5 100644 --- a/distro/common/html/chef-solr.8.html +++ b/distro/common/html/chef-solr.8.html @@ -144,9 +144,15 @@ wiki, http://wiki.opscode.com/display/chef/Home.</p> <h2 id="AUTHOR">AUTHOR</h2> +<<<<<<< HEAD:distro/common/html/chef-solr.8.html <p>Chef was written by Adam Jacob <a href="mailto:adam@ospcode.com" data-bare-link="true">adam@ospcode.com</a> of Opscode (http://www.opscode.com), with contributions from the community. This manual page was written by Joshua Timberman <a href="mailto:joshua@opscode.com" data-bare-link="true">joshua@opscode.com</a> with +======= +<p>Chef was written by Adam Jacob <a href="mailto:adam@ospcode.com" data-bare-link="true">adam@ospcode.com</a> of Opscode +(http://www.opscode.com), with contributions from the community. This +manual page was written by Joshua Timberman <a href="mailto:joshua@opscode.com" data-bare-link="true">joshua@opscode.com</a> with +>>>>>>> 10-stable:chef/distro/common/html/chef-solr.8.html help2man. Permission is granted to copy, distribute and / or modify this document under the terms of the Apache 2.0 License.</p> @@ -155,8 +161,13 @@ found in /usr/share/common-licenses/Apache-2.0.</p> <ol class='man-decor man-foot man foot'> +<<<<<<< HEAD:distro/common/html/chef-solr.8.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/chef-solr.8.html <li class='tr'>chef-solr(8)</li> </ol> |