Commit 585bd3d2 authored by addyosmani's avatar addyosmani

further updates to index

parent adb76673
......@@ -106,37 +106,22 @@ href="https://github.com/addyosmani/todomvc/">View repository</a></li> </ul>
</section> <!-- /.widget -->
<<<<<<< HEAD
<section class="widget clearfix">
<h4 class="widgettitle">Contributors</h4>
<ul>
<li><a href="http://twitter.com/addyosmani">Addy Osmani</a></li>
<li><a
href="http://twitter.com/justinbmeyer">Justin Meyer</a></li>
<li><a
href="http://twitter.com/jeromegn">Jérôme Gravel-Niquet</a></li>
<li><a
href="http://twitter.com/macmann">Alex MacCaw</a></li>
<li><a href="">Ashish Sharma</a>
<li><a href="http://twitter.com/tomdale">Tom Dale</a>
</li>
=======
<section class="widget clearfix"> <h4 class="widgettitle">Contributors</h4> <ul> <li><a
<h4 class="widgettitle">Contributors include:</h4>
<ul> <li><a
href="http://twitter.com/addyosmani">Addy Osmani</a></li> <li><a
href="http://twitter.com/justinbmeyer">Justin Meyer</a></li> <li><a
href="http://twitter.com/jeromegn">Jérôme Gravel-Niquet</a></li> <li><a
href="http://twitter.com/macmann">Alex MacCaw</a></li>
<li><a href="">Ashish Sharma</a></li>
<li><a href="http://sproutcore.com">Tom Dale, Yehuda Katz</a></li>
<li><a href="http://developer.yahoo.com">The YUI team</a></li>
>>>>>>> aa2b269194fee9c46c1f3689c46cbe94e6635776
</ul>
</section> <!-- /.widget -->
</aside> <!-- /#sidebar -->
<footer id="footer">
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment