github-migration/compass
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fixed merge

Browse Source
This commit is contained in:
Brandon Mathis 2011-04-26 18:34:51 -05:00
parent 7106b7d719
commit 26f44fd8a2
3 changed files with 31 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
doc-src/layouts/article.haml
View File

@ -12,7 +12,7 @@
Version: Version:
%a.number(href="/CHANGELOG/")= compass_version %a.number(href="/CHANGELOG/")= compass_version
%article= yield %article= yield
-#comments= render "partials/disqus_comments" -comments= render "partials/disqus_comments"
%footer(role="contentinfo")= render "partials/footer" %footer(role="contentinfo")= render "partials/footer"
= @item[:content_for_javascripts] = @item[:content_for_javascripts]
= render "partials/analytics" = render "partials/analytics"

2
doc-src/layouts/example.haml
View File

@ -14,7 +14,7 @@
Version: Version:
%a.number(href="/CHANGELOG/")= compass_version %a.number(href="/CHANGELOG/")= compass_version
%article= yield %article= yield
-#comments= render "partials/disqus_comments" -comments= render "partials/disqus_comments"
%footer(role="contentinfo")= render "partials/footer" %footer(role="contentinfo")= render "partials/footer"
= @item[:content_for_javascripts] = @item[:content_for_javascripts]
= render "partials/analytics" = render "partials/analytics"