resolved conflict

machida · Jul 8, 2012 · 403601e · 403601e
1 parent 4ce6654
commit 403601e
Showing 1 changed file with 0 additions and 1 deletion.
diff --git a/app/views/tasks/_task.html.haml b/app/views/tasks/_task.html.haml
@@ -47,4 +47,3 @@
   .comments
     %ul
       = render task.comments
->>>>>>> 3a87896a141829a5ffa448b42fb14071609b7eec