Fixing merge errors
authordgfrancisco <dgfranciscorodriguez@gmail.com>
Thu, 2 Jun 2011 01:20:37 +0000 (20:20 -0500)
committerdgfrancisco <dgfranciscorodriguez@gmail.com>
Thu, 2 Jun 2011 01:20:37 +0000 (20:20 -0500)
commit1e46922b0f38afb93785b8b067935c8756eb2d99
tree489716f90e864820e99989437d3f5eb80470bcbe
parent72c7aa9d681a9378683c3dd2858042d411c69e1c
parent584e944a2c163ee345e70c65501c6018d0334b0f
Fixing merge errors

Signed-off-by: dgfrancisco <dgfranciscorodriguez@gmail.com>
app/stylesheets/app/content/question/_comments.sass