Permalink
Browse files

Merge remote-tracking branch 'roro/master'

Conflicts:
	pages/meetups/syd.html.haml
	site/meetups/syd.html
  • Loading branch information...
2 parents 961867c + d1a7dab commit 55a3fd7df6ffb9748d0d4b39acadb574fdc031c0 @dgoodlad dgoodlad committed Aug 15, 2012
Showing with 3 additions and 3 deletions.
  1. +1 −1 pages/meetups/syd.html.haml
  2. +2 −2 site/meetups/syd.html
@@ -8,7 +8,7 @@
#### Presentations (15min)
- * Ninefold Tech - Carl Woodward [@julio_ody](http://twitter.com/cjwoodward)
+ * Ninefold Tech - Carl Woodward [@cjwoodward](http://twitter.com/cjwoodward)
* Your name here
#### Lightning Talks (5min)
@@ -57,8 +57,8 @@ <h4 id='tuesday_august_14_from_630_for_7pm__trinity_bar'>Tuesday August 14 from
<h4 id='presentations_15min'>Presentations (15min)</h4>
<ul>
- <li>Ninefold Tech - Carl Woodward <a href='http://twitter.com/cjwoodward'>@julio_ody</a></li>
-
+ <li>Ninefold Tech - Carl Woodward <a href='http://twitter.com/cjwoodward'>@cjwoodward</a></li>
+
<li>Your name here</li>
</ul>

0 comments on commit 55a3fd7

Please sign in to comment.