Merge remote branch 'origin/json_xml' into json_xml

GerryG · Jan 23, 2013 · 22d0d15 · 22d0d15
2 parents d401f69 + 30ecf0b
commit 22d0d15
Showing 1 changed file with 0 additions and 1 deletion.
diff --git a/app/controllers/card_controller.rb b/app/controllers/card_controller.rb
@@ -291,7 +291,6 @@ def load_card
       else
 
         opts = if opts = params[:card]  ; opts.clone
-            elsif opts = params[:object]; opts
             else                        {}
             end