summaryrefslogtreecommitdiff
path: root/tbc
diff options
context:
space:
mode:
authorhardythe12013-12-15 02:40:10 +0530
committerhardythe12013-12-15 02:40:10 +0530
commit5af6ad58e7ea0b20b0a676ffdaf6e9ebcd3c8100 (patch)
tree38414d96f666173cb48a2e7ee3a63c53cbf38f3d /tbc
parent333cb2736376db4ddd635121293dd62a3a485f5a (diff)
downloadPython-TBC-Interface-5af6ad58e7ea0b20b0a676ffdaf6e9ebcd3c8100.tar.gz
Python-TBC-Interface-5af6ad58e7ea0b20b0a676ffdaf6e9ebcd3c8100.tar.bz2
Python-TBC-Interface-5af6ad58e7ea0b20b0a676ffdaf6e9ebcd3c8100.zip
updating styling
Diffstat (limited to 'tbc')
-rw-r--r--tbc/templates/tbc/book-details.html4
1 files changed, 0 insertions, 4 deletions
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>