diff options
| author | Jayaram Pai | 2013-11-29 14:00:16 +0530 |
|---|---|---|
| committer | Jayaram Pai | 2013-11-29 14:00:16 +0530 |
| commit | e03a02b0c848e41b390a18a32017e26e42be5864 (patch) | |
| tree | 3a194279d2b4723ecaf2691501420059d111b3b4 | |
| parent | be416071307ed621517961e00221c49e5c815327 (diff) | |
| parent | f49d0002184dea0884ec2b67ee7a7b437122e62c (diff) | |
| download | pyfoss-e03a02b0c848e41b390a18a32017e26e42be5864.tar.gz pyfoss-e03a02b0c848e41b390a18a32017e26e42be5864.tar.bz2 pyfoss-e03a02b0c848e41b390a18a32017e26e42be5864.zip | |
fixing merge conflict
| -rw-r--r-- | static/website/templates/page.html | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/static/website/templates/page.html b/static/website/templates/page.html index 2ec197c..16b2c57 100644 --- a/static/website/templates/page.html +++ b/static/website/templates/page.html @@ -90,7 +90,7 @@ {% endfor %} </div> <!-- /sidebar --> - + <div class="clearfix"></div> </div> <!-- /content-inner --> </div> <!-- /content-wrapper --> |