Skip to content
This repository has been archived by the owner on Apr 22, 2023. It is now read-only.

Commit

Permalink
Browse files Browse the repository at this point in the history
Fix merge-conflicts in HTML
  • Loading branch information
isaacs committed Feb 7, 2012
1 parent 1168355 commit 986785c
Showing 1 changed file with 0 additions and 16 deletions.
16 changes: 0 additions & 16 deletions doc/index.html
Expand Up @@ -78,7 +78,6 @@ <h2>Node.js in the Industry</h2>
<a href="#" id="download-close">X</a>
<img id="download-logo" src="download-logo.png" alt="node.js">
<ul id="installers" class="clearfix">
<<<<<<< HEAD
<li><a href="http://nodejs.org/dist/v0.7.2/node-v0.7.2.msi">Windows Installer</a><br>node-v0.7.2.msi</li>
<li><a href="http://nodejs.org/dist/v0.7.2/node-v0.7.2.pkg">Macintosh Installer</a><br>node-v0.7.2.pkg</li>
<li id="source"><a href="http://nodejs.org/dist/v0.7.2/node-v0.7.2.tar.gz">Source Code</a><br>node-v0.7.2.tar.gz</li>
Expand All @@ -88,17 +87,6 @@ <h2>Node.js in the Industry</h2>
<li><a href="http://nodejs.org/docs/v0.7.2/api/index.html">Documentation</a></li>
<li><a href="http://nodejs.org/dist/v0.7.2">Other release files</a></li>
<li><a href="https://raw.github.com/joyent/node/v0.7.2/LICENSE">License</a></li>
=======
<li><a href="http://nodejs.org/dist/v0.6.10/node-v0.6.10.msi">Windows Installer</a><br>node-v0.6.10.msi</li>
<li><a href="http://nodejs.org/dist/v0.6.10/node-v0.6.10.pkg">Macintosh Installer</a><br>node-v0.6.10.pkg</li>
<li id="source"><a href="http://nodejs.org/dist/v0.6.10/node-v0.6.10.tar.gz">Source Code</a><br>node-v0.6.10.tar.gz</li>
</ul>
<ul id="documentation">
<li><a href="https://raw.github.com/joyent/node/v0.6.10/ChangeLog">Change Log</a></li>
<li><a href="http://nodejs.org/docs/v0.6.10/api/index.html">Documentation</a></li>
<li><a href="http://nodejs.org/dist/v0.6.10">Other release files</a></li>
<li><a href="https://raw.github.com/joyent/node/v0.6.10/LICENSE">License</a></li>
>>>>>>> ry/v0.6
<li><a href="https://github.com/joyent/node">Git Repository</a></li>
<li><a href="https://github.com/joyent/node/wiki/Installing-Node.js-via-package-manager">Installing
with a Package Manager</a>
Expand Down Expand Up @@ -223,11 +211,7 @@ <h2>Explore Node.js</h2>
<!-- <li><a hrfe="http://twitter.com/nodejs" class="twitter">@nodejs</a></li> -->
</ul>

<<<<<<< HEAD
<p>Copyright 2010 <a href="http://joyent.com">Joyent, Inc</a>, Node.js is a <a href="/trademark-policy.pdf">trademark</a> of Joyent, Inc. View <a href="https://raw.github.com/joyent/node/v0.7.2/LICENSE">license</a>.</p>
=======
<p>Copyright 2010 <a href="http://joyent.com">Joyent, Inc</a>, Node.js is a <a href="/trademark-policy.pdf">trademark</a> of Joyent, Inc. View <a href="https://raw.github.com/joyent/node/v0.6.10/LICENSE">license</a>.</p>
>>>>>>> ry/v0.6
</div>


Expand Down

0 comments on commit 986785c

Please sign in to comment.