need to do a better job in resolving conflicts

toamitkumar · Apr 25, 2012 · 0e1d651 · 0e1d651
1 parent ca65106
commit 0e1d651
Showing 1 changed file with 0 additions and 2 deletions.
diff --git a/app/controllers/assessments_controller.rb b/app/controllers/assessments_controller.rb
@@ -5,7 +5,6 @@ class AssessmentsController < ApplicationController
 
   def index
     @assessments = Assessment.all
-    @categories = Hash[*Category.all.collect { |c| [c.code, c.name]}.flatten]
   end
 
   def show
@@ -15,7 +14,6 @@ def show
   end
 
   def new
-    @categories = Hash[*Category.all.collect { |c| [c.code, c.name]}.flatten]
     @questions = Question.find_all_by_category_code('overview')
   end