fixing conflicts [#8]

2015-07-18 17:30:31 +02:00
parent eb083c700b 370924a377
commit 12d35085e0
2 changed files with 3 additions and 2 deletions
--- a/app/views/debates/_debate.html.erb
+++ b/app/views/debates/_debate.html.erb
@@ -1,12 +1,12 @@
 <div id="debate-<%= debate.id %>" class='debate'>
  <p><%= link_to debate.title, debate %></p>
  <p><%= debate.description %></p>
-  
+
  <p>
    Creado el: <%= l debate.created_at.to_date %>
    por: <%= debate.author.name %>
  </p>
-  
+
  <p><%= render 'shared/tags', debate: debate %></p>
 </div>
 <br/><br/><br/><br/>