diff options
| author | hardythe1 | 2014-08-27 16:54:15 +0530 |
|---|---|---|
| committer | hardythe1 | 2014-08-27 16:54:15 +0530 |
| commit | cbf50bf6eb036f2121d7559fe8e67e104a3a4694 (patch) | |
| tree | ce72ba69e3665f3a30be725174596e330b35e46a /website | |
| parent | 324154d510a97e00f4e15bc68af595f13484f16e (diff) | |
| download | pyfoss-cbf50bf6eb036f2121d7559fe8e67e104a3a4694.tar.gz pyfoss-cbf50bf6eb036f2121d7559fe8e67e104a3a4694.tar.bz2 pyfoss-cbf50bf6eb036f2121d7559fe8e67e104a3a4694.zip | |
resolving conflict
Diffstat (limited to 'website')
| -rw-r--r-- | website/templates/page.html | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/website/templates/page.html b/website/templates/page.html index 6088ed7..cebac2c 100644 --- a/website/templates/page.html +++ b/website/templates/page.html @@ -20,7 +20,6 @@ <span id="brand-text">Python</span> </a> </div> - <ul id="main-nav" class="nav nav-pills pull-right"> {% for nav in navs %} {% with subnavs=nav.subnav_set.all %} |