Permalink
Browse files

Merge branch 'master', remote-tracking branch 'whiskyweb/master'

  • Loading branch information...
2 parents 7a86bad + 40ba4b4 commit f5c9cc6acfbe812753942443795f985e130878fd @dragoonis dragoonis committed Mar 29, 2013
Showing with 2 additions and 3 deletions.
  1. +2 −3 schedule.html
View
@@ -41,7 +41,7 @@ <h3 class="light">Day One - April 12<sup>th</sup></h3>
<tr>
<td class="time">13:00</td>
<td class="stripe"><a href="/speakers.html#ian">How Google Builds Web Services</a> - <a href="https://twitter.com/ianbarber">Ian Barber</a></td>
- <td class="stripe"><a href="/speakers.html#linda">Making Things Better</a> - <a href="https://twitter.com/hyper_linda">Linda Sandvik</a></td>
+ <td class="stripe"><a href="/speakers.html#andy">Anatomy of a Responsive Page Load</a> - <a href="https://twitter.com/andyhume">Andy Hume</a></td>
</tr>
<tr>
<td class="time">14:00</td>
@@ -54,9 +54,8 @@ <h3 class="light">Day One - April 12<sup>th</sup></h3>
</tr>
<tr>
<td class="time">16:00</td>
- <td><a href="/speakers.html#andy">Anatomy of a Responsive Page Load</a> - <a href="https://twitter.com/andyhume">Andy Hume</a></td>
+ <td><a href="/speakers.html#linda">Making Things Better</a> - <a href="https://twitter.com/hyper_linda">Linda Sandvik</a></td>
<td><a href="/speakers.html#phil">Real Time Web Apps in the Wild</a> - <a href="https://twitter.com/leggetter">Phil Leggetter</a></td>
-
</tr>
<tr>
<td class="time">17:00</td>

0 comments on commit f5c9cc6

Please sign in to comment.