that merge thing again

UFPE · Apr 18, 2015 · 3a47609 · 3a47609
2 parents 63b3e12 + fb5888e
commit 3a47609
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 1 deletion.
diff --git a/app/controllers/problems_controller.rb b/app/controllers/problems_controller.rb
@@ -6,7 +6,7 @@ def home
 
 	def index
     if @current_user
-    @collections = @current_user.collections
+      @collections = @current_user.collections
     else
       @collections = []
     end

diff --git a/coursequestionbank_test b/coursequestionbank_test