Permalink
Browse files

Fix conflicts in active_shipping/base

  • Loading branch information...
1 parent 5d82b77 commit cedf1bccefa393340935f17b24ebc864c9e6ce63 @radar radar committed Jan 7, 2013
Showing with 0 additions and 5 deletions.
  1. +0 −5 app/models/spree/calculator/active_shipping/base.rb
@@ -192,13 +192,8 @@ def packages(order)
units = Spree::ActiveShipping::Config[:units].to_sym
packages = []
weights = convert_order_to_weights_array(order)
-<<<<<<< HEAD
- max_weight = max_weight_for_country(order.ship_address.country)
-
-=======
max_weight = get_max_weight(order)
->>>>>>> 01b98fd... Added the ability to define a max weight per package.
if max_weight <= 0
packages << Package.new(weights.sum, [], :units => units)
else

0 comments on commit cedf1bc

Please sign in to comment.