Fixing merge issue
authordgfrancisco <dgfranciscorodriguez@gmail.com>
Sat, 4 Jun 2011 03:17:16 +0000 (22:17 -0500)
committerdgfrancisco <dgfranciscorodriguez@gmail.com>
Sat, 4 Jun 2011 03:17:16 +0000 (22:17 -0500)
commitb8e699cf760e3e40cb080b05413e234ff7920ec6
tree72e3a089f248583657f0e1a2a9a404828513010a
parentd74c2f4bd62d5ac740b85da0c502322af3fe7257
parent7e5dbd7acb0e7917ffb11325b7a0a4519c678efc
Fixing merge issue

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