consul/nairobi
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

removes conflict code which was left there by mistake

Browse Source
This commit is contained in:
kikito
2015-07-29 18:45:10 +02:00
parent 0efa9c77f1
commit a4bc9ed08f
1 changed files with 9 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
app/views/debates/show.html.erb
View File

@@ -43,20 +43,6 @@
</div> </div>
</section> </section>
<<<<<<< HEAD
<div id="comments" class="comments">
<h2><%= t("debates.show.comments") %></h2>
<div style="padding-bottom:60px">
<%= t("debates.show.leave_comment") %>
<%= render 'comments/form', parent: @debate %>
</div>
<%= render @debate.root_comments %>
</div>
<% if current_user && @debate.editable_by?(current_user) %>
<%= link_to t("debates.show.edit_debate_link"), edit_debate_path(@debate), class: 'button radius right' %>
<% end %>
=======
<section class="row-full comments"> <section class="row-full comments">
<div class="row"> <div class="row">
<div id="comments" class="small-12 column"> <div id="comments" class="small-12 column">
@@ -67,8 +53,6 @@
</div> </div>
<%= render @debate.root_comments %> <%= render @debate.root_comments %>
</div> </div>
>>>>>>> Adds new styles for debates show
<% if current_user && @debate.editable_by?(current_user) %> <% if current_user && @debate.editable_by?(current_user) %>
<%= link_to t("debates.show.edit_debate_link"), edit_debate_path(@debate), :class => 'button radius right' %> <%= link_to t("debates.show.edit_debate_link"), edit_debate_path(@debate), :class => 'button radius right' %>
<% end %> <% end %>