fixes conflicts

This commit is contained in:
rgarcia
2015-08-06 13:42:57 +02:00
35 changed files with 442 additions and 191 deletions

View File

@@ -0,0 +1 @@
$("#<%= dom_id(@debate) %>_votes").html('<%= j render("debates/votes", debate: @debate) %>');