Fix merge conflict

indentlabs · Sep 30, 2016 · 3bf3f84 · 3bf3f84
1 parent 4ee0d5f
commit 3bf3f84
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/app/controllers/content_controller.rb b/app/controllers/content_controller.rb
@@ -24,7 +24,7 @@ def index
   def show
     # TODO: Secure this with content class whitelist lel
     @content = content_type_from_controller(self.class).find(params[:id])
-
+    
     @question = @content.question if current_user.present? and current_user == @content.user
 
     respond_to do |format|