Cleaned Up ask module for master

2013-08-27 14:28:18 +08:00 · 2013-08-27 14:28:18 +08:00 · b20955579e
parent 1ebda22f0e
commit b20955579e
1 changed files with 0 additions and 1 deletions
--- a/vendor/built_in_modules/ask_new/app/controllers/panel/ask/front_end/ask_questions_controller.rb
+++ b/vendor/built_in_modules/ask_new/app/controllers/panel/ask/front_end/ask_questions_controller.rb
@ -42,6 +42,5 @@ class Panel::Ask::FrontEnd::AskQuestionsController < OrbitWidgetController
      @frontend_style = @item.frontend_style
    end
    @item = Page.find(params[:page_id]) rescue nil
->>>>>>> a4fa967... Fix mailing redirect
  end
 end