# HG changeset patch
# User primal primal007@gmail.com
# Date 1322931346 -19800
# Node ID 81099aef6a18fcb684061bad48ae9a650222ca22
# Parent  12ae5cf167fc161e9329ac73eaed9c4aac3d2144
Merge fix

diff -r 12ae5cf167fc -r 81099aef6a18 project/templates/_menu.html
--- a/project/templates/_menu.html	Sat Dec 03 20:15:59 2011 +0530
+++ b/project/templates/_menu.html	Sat Dec 03 22:25:46 2011 +0530
@@ -102,15 +102,17 @@
     {% if user.is_superuser %}
     <li><a href="/{{ params.scope }}/manage_payments/">Manage Payments</a></li>
     {% endif %}
+    <li>Live Blog
+		<ul>
+			<li><a href="/{{ params.scope }}/about/day0/">Day 0</a></li>
+			<!--<li><a href="/{{ params.scope }}/about/day1/">Day 1</a></li> --!>
+			<!--<li><a href="/{{ params.scope }}/about/day1/">Day 2</a></li> --!>
+			<!--<li><a href="/{{ params.scope }}/about/day1/">Day 3</a></li> --!>
+			<!--<li><a href="/{{ params.scope }}/about/day1/">Day 4</a></li> --!>
+		</ul>
+	</li>
+	
+	<li><a href="/{{ params.scope }}/about/speakerinfo/">Speaker Info</a></li>
+	
   </ul>
-<li>
-<ul>
-<li>Live Blog</li>
-<li><a href="/{{ params.scope }}/about/speakerinfo/">Speaker Info</a></li>
-<li><a href="/{{ params.scope }}/about/day0/">Day 0</a></li>
-<!--<li><a href="/{{ params.scope }}/about/day1/">Day 1</a></li> --!>
-<!--<li><a href="/{{ params.scope }}/about/day1/">Day 2</a></li> --!>
-<!--<li><a href="/{{ params.scope }}/about/day1/">Day 3</a></li> --!>
-<!--<li><a href="/{{ params.scope }}/about/day1/">Day 4</a></li> --!>
-</ul>
 </div>
diff -r 12ae5cf167fc -r 81099aef6a18 project/templates/_right_menu.html
--- a/project/templates/_right_menu.html	Sat Dec 03 20:15:59 2011 +0530
+++ b/project/templates/_right_menu.html	Sat Dec 03 22:25:46 2011 +0530
@@ -3,7 +3,7 @@
 <ul>
 <li>Please contact our <b>Kiosk setup at IIT-Bombay main gate</b> for accommodation and any other details.</li>
 <li><a href="/scipyin/2011/talks-cfp/conference/">Updated Conference Schedule</a></li>
-<li><a href=""/scipyin/2011/about/speakerinfo/">Important Information for Speaker</a></li>
+<li><a href=""/scipyin/2011/talks-cfp/conference/">Important Information for Speaker</a></li>
 <hr/>
 <h3 style="padding-left:2px;"> Documents of Aid</h3>
 <li> <a href="/static/files/Reaching_IITB.pdf">This</a> can help you in Reaching IITB.</li>