fixed merge
This commit is contained in:
parent
7106b7d719
commit
26f44fd8a2
@ -12,7 +12,7 @@
|
||||
Version:
|
||||
%a.number(href="/CHANGELOG/")= compass_version
|
||||
%article= yield
|
||||
-#comments= render "partials/disqus_comments"
|
||||
-comments= render "partials/disqus_comments"
|
||||
%footer(role="contentinfo")= render "partials/footer"
|
||||
= @item[:content_for_javascripts]
|
||||
= render "partials/analytics"
|
||||
|
@ -14,7 +14,7 @@
|
||||
Version:
|
||||
%a.number(href="/CHANGELOG/")= compass_version
|
||||
%article= yield
|
||||
-#comments= render "partials/disqus_comments"
|
||||
-comments= render "partials/disqus_comments"
|
||||
%footer(role="contentinfo")= render "partials/footer"
|
||||
= @item[:content_for_javascripts]
|
||||
= render "partials/analytics"
|
||||
|
Loading…
Reference in New Issue
Block a user