Skip to content
This repository
Browse code

Merge remote-tracking branch 'roro/master'

Conflicts:
	pages/meetups/syd.html.haml
	site/meetups/syd.html
  • Loading branch information...
commit 55a3fd7df6ffb9748d0d4b39acadb574fdc031c0 2 parents 961867c + d1a7dab
David Goodlad authored August 15, 2012
2  pages/meetups/syd.html.haml
@@ -8,7 +8,7 @@
8 8
 
9 9
       #### Presentations (15min)
10 10
 
11  
-      * Ninefold Tech - Carl Woodward [@julio_ody](http://twitter.com/cjwoodward)
  11
+      * Ninefold Tech - Carl Woodward [@cjwoodward](http://twitter.com/cjwoodward)
12 12
       * Your name here
13 13
 
14 14
       #### Lightning Talks (5min)
4  site/meetups/syd.html
@@ -57,8 +57,8 @@ <h4 id='tuesday_august_14_from_630_for_7pm__trinity_bar'>Tuesday August 14 from
57 57
           <h4 id='presentations_15min'>Presentations (15min)</h4>
58 58
           
59 59
           <ul>
60  
-          <li>Ninefold Tech - Carl Woodward <a href='http://twitter.com/cjwoodward'>@julio_ody</a></li>
61  
-          
  60
+          <li>Ninefold Tech - Carl Woodward <a href='http://twitter.com/cjwoodward'>@cjwoodward</a></li>
  61
+
62 62
           <li>Your name here</li>
63 63
           </ul>
64 64
           

0 notes on commit 55a3fd7

Please sign in to comment.
Something went wrong with that request. Please try again.