# HG changeset patch # User primal primal007@gmail.com # Date 1322923559 -19800 # Node ID 12ae5cf167fc161e9329ac73eaed9c4aac3d2144 # Parent ebdde7b89f34b25367a1b9bc698df2fd3e39e88c# Parent ac6dbb3685dbc8ebc0ec9436d4dfc093f7326510 merge diff -r ac6dbb3685db -r 12ae5cf167fc project/templates/_menu.html --- a/project/templates/_menu.html Sat Dec 03 20:05:08 2011 +0530 +++ b/project/templates/_menu.html Sat Dec 03 20:15:59 2011 +0530 @@ -102,17 +102,15 @@ {% if user.is_superuser %}
  • Manage Payments
  • {% endif %} -
  • Live Blog - -
  • - -
  • Speaker Info
  • - +
  • + diff -r ac6dbb3685db -r 12ae5cf167fc project/templates/_right_menu.html --- a/project/templates/_right_menu.html Sat Dec 03 20:05:08 2011 +0530 +++ b/project/templates/_right_menu.html Sat Dec 03 20:15:59 2011 +0530 @@ -3,7 +3,7 @@