Skip to content

Commit b828cf1

Browse files
committed
Merge branch 'prod'
2 parents 4403695 + 7ac6ae3 commit b828cf1

File tree

2 files changed

+2
-13
lines changed

2 files changed

+2
-13
lines changed

resources/home.html

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -26,21 +26,10 @@ <h3>Nashville,<span>&nbsp;</span>TN</h3>
2626
</div>
2727
<div class="section" id="main">
2828
<h4>The PHP Community Conference is Sold Out!</h4>
29-
<a href="http://tek11.phparch.com/" style="display: block;
30-
float: right;"><img
31-
src="images/tek11.png" width="200"/></a>
3229
<p>Thanks to our phenomenal sponsors, speakers, and attendees,
3330
and everyone else that has had kind things to say about our
3431
efforts, we have sold out the first PHP Community
3532
Conference!</p>
36-
<p>Though you may have missed us for 2011, we'll be back again
37-
next year. We're already working on how to make the PHP
38-
Community Conference even better in 2012. In the meantime, check
39-
out <a
40-
href="http://tek11.phparch.com/">php|tek 2011</a> next month
41-
in Chicago, one of
42-
many amazing PHP community events that inspired The PHP Community
43-
Conference.</p>
4433
</div>
4534

4635
<div class="sectionWide">

resources/schedule.html

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -82,9 +82,9 @@ <h1>PHP Community
8282
<tr>
8383
<td class="hour">11</td>
8484
<td class="minute">30</td>
85-
<td rowspan="3"><a href="speakers/#moon">Brian Moon -
85+
<td width="25%" rowspan="3"><a href="speakers/#moon">Brian Moon -
8686
Phorum</a></td>
87-
<td rowspan="3"><a href="speakers/#mclellan">Drew Mclellan - The Original Hypertext
87+
<td width="25%" rowspan="3"><a href="speakers/#mclellan">Drew Mclellan - The Original Hypertext
8888
Preprocessor</a></td>
8989
</tr>
9090
<tr>

0 commit comments

Comments
 (0)