Andal.LND/edx-platform
4
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Fixed merge conflicts

Browse Source
This commit is contained in:
Kyle Fiedler
2012-01-31 15:32:56 -05:00
parent 2d3ebff218 91f9c31e1f
commit 9f21488aed
1 changed files with 1 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
index.html
View File

@@ -54,7 +54,7 @@
<li>
<img src="/static/staff/agarwal-mit-news-small.jpg">
<h2>Anant Agarwal</h2>
<p>Director of MIT's Computer Science and Artificial Intelligence Laboratory (CSAIL) and a professor of the Electrical Engineering and Computer Science department at MIT. His research focus is in parallel computer architectures and cloud software systems, and he is a founder of several successful startups, including Tilera, a company that produces scalable multicore processors. Prof. Agarwal won MIT&rsquo;s Smullin and Jamieson prizes for teaching and co-authored the course textbook &ldquo;Foundations of Analog and Digital Electronic Circuits.&rdquo;</p></li>
<p>Director of MIT&rsquo;s Computer Science and Artificial Intelligence Laboratory (CSAIL) and a professor of the Electrical Engineering and Computer Science department at MIT. His research focus is in parallel computer architectures and cloud software systems, and he is a founder of several successful startups, including Tilera, a company that produces scalable multicore processors. Prof. Agarwal won MIT&rsquo;s Smullin and Jamieson prizes for teaching and co-authored the course textbook &ldquo;Foundations of Analog and Digital Electronic Circuits.&rdquo;</p></li>
<li>
<img src="/static/staff/gjs-small.jpg">
@@ -68,24 +68,6 @@
</ul>
</section>
<!-- <div class="secondary"> -->
<!-- <section class="credits"> -->
<!-- <h1> Credits </h1> -->
<!-- <p> The codebase was made possible by Django, JQuery, JQueryUI, -->
<!-- MathJAX, swfobject, askbot, django-simplewiki, pyparsing, and the -->
<!-- original FancyBox. Graphic design and css started from a free template -->
<!-- from <a href="http://www.dotemplate.com/">dotemplate.com</a>, one of -->
<!-- the few, genuinely free template web sites (although you have to -->
<!-- e-mail the owner to find that out), and was heavily modified by Piotr -->
<!-- Mitros, and later, thoughtbot.</p> -->
<!-- <p> The system is running in the Amazon cloud, which allows us to hold up to anticipated loads. </p> -->
<!-- </section> -->
<!-- </div> -->
</section>
<div id="enroll" class="leanModal_box" name="enroll"><%include file="create_account.html" /></div>