fixed merge conflict

1 files changed, 15 insertions, 6 deletions

diff --git a/website/templates/register_2013.html b/website/templates/register_2013.html
index e43430c..a142b70 100644
--- a/website/templates/register_2013.html
+++ b/website/templates/register_2013.html
@@ -8,7 +8,7 @@
             <th>Tickets</th>
             <th>Price</th>
             <tr>
-                <td>Regular Registration</td>
+                <td>Regular Registration<sup>*</sup></td>
                 <td>INR 600</td>
             </tr>
             <tr>
@@ -23,7 +23,7 @@
             <th>Addons</th>
             <th>Price</th>
             <tr>
-                <td>Accommodation</td>
+                <td>Accommodation<sup>#</sup></td>
                 <td>INR 740</td>
             </tr>
             <tr>
@@ -32,10 +32,19 @@
             </tr>
         </table>
     </div>
+    
+    <div style="margin-left: 10px;">
+    <div class="clearfix"></div>
+    <a class="button small success" href="http://scipyindia2013.doattend.com/">Register</a>
+    <strong>for SciPy India 2013.</strong>
+    <br>
+    <h5>Note:</h5>
+    * - Regular Registrants should bring any one of their identification card during the event. <br> <br>
+    # - Accommodation will be provided for 4 days starting from the previous day of the event. 
+    <br><br>
+    We regret the inconvinience caused earlier. We had some issues with the payment gateway.
+    </div>
+
 </div> <!-- /row -->
-<a class="button small success" href="http://scipyindia2013.doattend.com/">Register</a>
-<strong>for SciPy Conference 2013.</strong>
-<br>
-We regret the inconvinience caused earlier. We had some issues with the payment gateway.
 </div> <!-- /row -->
 {% endblock %}