From 5af6ad58e7ea0b20b0a676ffdaf6e9ebcd3c8100 Mon Sep 17 00:00:00 2001
From: hardythe1
Date: Sun, 15 Dec 2013 02:40:10 +0530
Subject: updating styling

---
 tbc/templates/tbc/book-details.html | 4 ----
 1 file changed, 4 deletions(-)

(limited to 'tbc')

diff --git a/tbc/templates/tbc/book-details.html b/tbc/templates/tbc/book-details.html
index 8887142..c2780d4 100644
--- a/tbc/templates/tbc/book-details.html
+++ b/tbc/templates/tbc/book-details.html
@@ -17,7 +17,6 @@
 <th>#</th>
 <th>Chapters</th>
 {% for chapter in chapters %}
-<<<<<<< HEAD
     <tr>
         <td>
             {{ forloop.counter }}
@@ -26,9 +25,6 @@
             <a href="https://nbviewer.ipython.org/url/dev.fossee.in{% static 'uploads/' %}{{ chapter.notebook }}">{{ chapter.name }}</a>
         </td>
     </tr>
-=======
-    <li><a href="http://nbviewer.ipython.org/url/tbc-python.fossee.in{% static 'uploads/' %}{{ chapter.notebook }}">{{ chapter.name }}</a>
->>>>>>> b9102b56140db8ad81b2b4e3d1dfb99c6bebb3ab
 {% endfor %}
 </table>
 <hr>
-- 
cgit